Merge branch 'master' of https://github.com/c2corg/c2ci18n
Merge branch 'master' of https://github.com/c2corg/c2ci18n