Sync with master
commit37f085bb52bb507d786c36ae50951e460f4f15c7
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 21:22:13 +0000 (26 14:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 21:22:13 +0000 (26 14:22 -0700)
tree3450e6d8649c746752a2fecb6e1af16a4b5030a7
parent8d9f645cfbd48e3a711219eb156b22f174040513
parentfae46aa0ae5318bbb20f0ef871721bf49e292cea
Sync with master