From: Jiang Xin <worldhello.net@gmail.com>
Date: Tue, 14 Jul 2015 23:06:49 +0000 (+0800)
Subject: Merge branch 'fr_v2.5.0-round2' of git://github.com/jnavila/git
X-Git-Tag: v2.5.0-rc3~2^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=297230d4900fb038271bf75412358e89f7c7565d;p=thirdparty%2Fgit.git

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)
---

297230d4900fb038271bf75412358e89f7c7565d