Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Dec 2015 17:45:06 +0000 (09:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Dec 2015 17:45:16 +0000 (09:45 -0800)
commitbdb32a88faf1ee56d51420c712c84b68815ea6d6
treed03683c1312a513f56cc5ffc897f35c116119a0e
parent9c69f77dcb2bd768182c3549c6dfaca510a7eb9a
parent1aaf14975709c069a87c2673551296a6eb3f82c5
Sync with maint