]> git.street.me.uk Git - andy/viking.git/commitdiff
Merge branch 'i18n'
authorGuilhem Bonnefille <guilhem.bonnefille@gmail.com>
Tue, 8 Feb 2011 21:09:22 +0000 (22:09 +0100)
committerGuilhem Bonnefille <guilhem.bonnefille@gmail.com>
Tue, 8 Feb 2011 21:09:22 +0000 (22:09 +0100)

Trivial merge