Sync with maint

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

Junio C Hamano committed Oct 17, 2013 at 15:54 UTC 83f18cdd71d9154c9b563d13c502dd475b3ac88c

No changes.