]> git.street.me.uk Git - andy/viking.git/commitdiff
Merge branch 'i18n-launchpad'
authorGuilhem Bonnefille <guilhem.bonnefille@gmail.com>
Mon, 15 Mar 2010 20:51:08 +0000 (21:51 +0100)
committerGuilhem Bonnefille <guilhem.bonnefille@gmail.com>
Mon, 15 Mar 2010 20:51:08 +0000 (21:51 +0100)

Trivial merge