Merge branch 'master' into i18n-launchpad
commitc9ee385c638ffa5266b9cc703620939ac03a7c07
authorGuilhem Bonnefille <guilhem.bonnefille@gmail.com>
Fri, 5 Feb 2010 21:57:52 +0000 (5 22:57 +0100)
committerGuilhem Bonnefille <guilhem.bonnefille@gmail.com>
Fri, 5 Feb 2010 21:57:52 +0000 (5 22:57 +0100)
treecd7659803cd4f6d2ab1da9c40af572bde4632747
parent029cf71df47a928a7fecf629458663eda2b94a75
parentdb32b80989fdaaf09be070d17ed50341313440e3
Merge branch 'master' into i18n-launchpad
po/ChangeLog