Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Dec 2015 19:39:56 +0000 (11:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Dec 2015 19:39:56 +0000 (11:39 -0800)
* maint:
Prepare for 2.6.4

Trivial merge