From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Sep 2013 20:58:16 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.5-rc0~198
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a41de8f81d8fa39fa17943cd1ed5e0274fef187;p=git

Merge branch 'maint'

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

0a41de8f81d8fa39fa17943cd1ed5e0274fef187