Sync with 2.3.2
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2015 22:59:12 +0000 (14:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2015 22:59:12 +0000 (14:59 -0800)
* maint:
Git 2.3.2

Trivial merge