Merge branch 'maint'

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

Author: gitster

po/TEAMS

@@ -15,6 +15,7 @@ Members:	Thomas Rast <[email protected]>
 Language:	fr (French)
 Repository:	https://github.com/jnavila/git
 Leader:		Jean-Noël Avila <[email protected]>
+Members:	Sébastien Helleu <[email protected]>
 
 Language:	is (Icelandic)
 Leader:		Ævar Arnfjörð Bjarmason <[email protected]>