Sync with 2.6.4
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Dec 2015 22:13:52 +0000 (14:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Dec 2015 22:13:52 +0000 (14:13 -0800)
Trivial merge