Sync with 1.7.11.4
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Jul 2012 20:17:31 +0000 (13:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Jul 2012 20:18:18 +0000 (13:18 -0700)
commit9c9b9ede9062ad702a6aa4384a597beb473e0293
tree21edd4384f05415e33d63541793937e3bc28137b
parent3e6d07174713ab4e1d66bb8324d0d73c96211b12
parent0e4c8822e98e27c3c63125570c8bcbf0a8fd34da
Sync with 1.7.11.4

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