Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2012 19:50:36 +0000 (12:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2012 19:50:36 +0000 (12:50 -0700)
commitb5d156c3622fa522966034c78fd6ed9a15504d46
treefca4cc5d315dd77becd730321f1b7df72a420596
parent16eed7c9938a65022010c3d95ada911b2fd46d25
parent1a002c73ba63799dda75a4c28da5b562eea7a3ff
Sync with maint