Sync with 1.8.3.1

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

Junio C Hamano committed Jun 10, 2013 at 12:35 UTC 39fd762572d42a118e577d9095d83d84f3db9ddf

No changes.