Merge branch 'maint'
authorJunio C Hamano <redacted>
Tue, 3 Sep 2013 20:58:16 +0000 (13:58 -0700)
committerJunio C Hamano <redacted>
Tue, 3 Sep 2013 20:58:16 +0000 (13:58 -0700)
* maint:
  fix shell syntax error in template
  l10n: fr.po: hotfix for commit 6b388fc


Trivial merge
git clone https://git.99rst.org/PROJECT