Sync with maintmaster
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)
* maint:


Trivial merge