Sync with maint
commit83f18cdd71d9154c9b563d13c502dd475b3ac88c
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:54:28 +0000 (17 15:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:54:28 +0000 (17 15:54 -0700)
treed34103ab52b3557e5bb518f980580a46c2ae14da
parent1d25dd416f08f39042d23340db380f28abb81962
parent92ab409055f6f8e379a7a0af731dbad7e1d43af0
Sync with maint

Signed-off-by: Junio C Hamano <gitster@pobox.com>