Merge branch 'maint-1.8.3' into maint
commit8ed64dfe7377971963182e9cfcd4b8da82337438
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Sep 2013 20:54:32 +0000 (3 13:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Sep 2013 20:54:32 +0000 (3 13:54 -0700)
treebbfdeb60226b3f415d15f567d3aac4ee06054abd
parente230c568c4b9a991e3175e5f65171a566fd8e39c
parente5be297279e8ee8c503eb59da21ab17edc40e748
Merge branch 'maint-1.8.3' into maint

* maint-1.8.3:
  fix shell syntax error in template