Merge branch 'maint'

* maint: fix shell syntax error in template l10n: fr.po: hotfix for commit 6b388fc

Junio C Hamano committed Sep 3, 2013 at 13:58 UTC 0a41de8f81d8fa39fa17943cd1ed5e0274fef187

No changes.