Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Dec 2015 19:19:43 +0000 (11:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Dec 2015 19:19:43 +0000 (11:19 -0800)
* maint:
Prepare for 2.6.5

Trivial merge