Merge git://github.com/git-l10n/git-po into maint
commiteb76545715e375c163389bffa0f1a75c5537936c
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Sep 2013 20:58:03 +0000 (3 13:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Sep 2013 20:58:03 +0000 (3 13:58 -0700)
tree12da19a1dbd69de6d5645781a64b2f8b99ab9001
parent8ed64dfe7377971963182e9cfcd4b8da82337438
parent21860882c8782771e99aa68fab6e365c628ff39d
Merge git://github.com/git-l10n/git-po into maint

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