Merge branch 'fr_v2.7.0' of git://github.com/jnavila/git
authorJiang Xin <worldhello.net@gmail.com>
Sun, 20 Dec 2015 11:31:47 +0000 (19:31 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Sun, 20 Dec 2015 11:31:47 +0000 (19:31 +0800)
* 'fr_v2.7.0' of git://github.com/jnavila/git:
l10n: fr v2.7.0 round 1 (2477t)

Trivial merge