Merge branch 'fr_v2.5.0-round2' of git://github.com/jnavila/git
commit297230d4900fb038271bf75412358e89f7c7565d
authorJiang Xin <worldhello.net@gmail.com>
Tue, 14 Jul 2015 23:06:49 +0000 (15 07:06 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Tue, 14 Jul 2015 23:06:49 +0000 (15 07:06 +0800)
tree324bffc08ec90481cae12f614edbef56c5f33a24
parent9ce8613349fd6575ce0402d6e6ff9825908da0a0
parentbe67fb4fc96068f4e1d1a2c59c4dd6bd11dd1dd2
Merge branch 'fr_v2.5.0-round2' of git://github.com/jnavila/git

* 'fr_v2.5.0-round2' of git://github.com/jnavila/git:
  l10n: fr v2.5.0 round 2 (2359t)