Sync with maintmaster
commit912bd497e93f0235a5999a77f8d54f5ff80a3a03
authorJunio C Hamano <gitster@pobox.com>
Sun, 28 Jun 2015 21:51:12 +0000 (28 14:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 28 Jun 2015 21:51:12 +0000 (28 14:51 -0700)
treec9878d7328aee0ddeff38cbe7a533da343f47cf0
parent7ecec52d42a964c4a8e9f6ca41bb0b5ce00049b4
parent351d06df519ee405a1926e0c6ee34d6a1dba6b46
Sync with maint

* maint: