Sync with maint

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

Junio C Hamano committed Dec 22, 2014 at 12:43 UTC bbcefffcea9789e4a1a2023a1c778e2c07db77a7

No changes.