Merge branch 'maint-1.8.2' into maint-1.8.3
commite5be297279e8ee8c503eb59da21ab17edc40e748
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Sep 2013 20:54:26 +0000 (3 13:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Sep 2013 20:54:26 +0000 (3 13:54 -0700)
tree23dff8ccf588bae744b107ec994be2bd9d551628
parenta3bc3d070cacf07dbe11b4bfec57554c8bbf1957
parent6897a64b652d83e477389ec1a248b47b8d821db6
Merge branch 'maint-1.8.2' into maint-1.8.3

* maint-1.8.2:
  fix shell syntax error in template