]> git.street.me.uk Git - andy/viking.git/commitdiff
Merge branch 'master' into i18n-launchpad
authorGuilhem Bonnefille <guilhem.bonnefille@gmail.com>
Mon, 1 Nov 2010 19:30:48 +0000 (20:30 +0100)
committerGuilhem Bonnefille <guilhem.bonnefille@gmail.com>
Mon, 1 Nov 2010 19:30:48 +0000 (20:30 +0100)

Trivial merge