From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Sep 2013 20:58:03 +0000 (-0700)
Subject: Merge git://github.com/git-l10n/git-po into maint
X-Git-Tag: v1.8.4.1~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb76545715e375c163389bffa0f1a75c5537936c;p=thirdparty%2Fgit.git

Merge git://github.com/git-l10n/git-po into maint

* git://github.com/git-l10n/git-po:
  l10n: fr.po: hotfix for commit 6b388fc
---

eb76545715e375c163389bffa0f1a75c5537936c