Sync with maint
commitb5c26758639cd934780620d4dd16854c8fdf8c34
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Jun 2013 20:00:03 +0000 (3 13:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Jun 2013 20:00:09 +0000 (3 13:00 -0700)
treea6373e93a80d1d45ecb7a71b1c9eca530668f54f
parent3684101a654d5a7b598d9810df3b498f2a8928d0
parent4b8f772ce4df667583243e434ca0548d5b84b3a6
Sync with maint