Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:49:37 +0000 (14:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:49:37 +0000 (14:49 -0700)
* maint:
Start preparing for 2.5.1

Trivial merge