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)
commitff86faf2fa02bc21933c9e1dcc75c8d81b3e104a
treec95970c3507b89fe43181df983f73c8f1db262fb
parent8f8d0ecfde871144ae839876039fe4e8fed75a9c
parent552a736de775994570570a0514f24e32686afbe0
Sync with maint

* maint:
  Start preparing for 2.5.1