Merge branch 'v2.3.0' of git://github.com/jnavila/git
authorJiang Xin <worldhello.net@gmail.com>
Mon, 19 Jan 2015 02:12:46 +0000 (10:12 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Mon, 19 Jan 2015 02:12:46 +0000 (10:12 +0800)
* 'v2.3.0' of git://github.com/jnavila/git:
l10n: fr.po v2.3.0 round 2

Trivial merge