Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:16:27 +0000 (13:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:16:27 +0000 (13:16 -0800)
* maint:
Prepare for 2.3.2

Trivial merge