Sync with master
commit3179493ddf99afea85d647dbfa9ebe48a70b9cc0
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 May 2015 20:40:52 +0000 (19 13:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 May 2015 20:40:52 +0000 (19 13:40 -0700)
treeebb10ebd64c3ecb00953eefb188103aea5388954
parentf7be074306b8b5761a54a6ca9f394bb8bb5dbdd0
parent6c1249c503f39ca45ca5b183527b22192cdaf7a7
Sync with master

* master:
  Third batch for 2.5 cycle