Sync with maint
commit259b5e6d33800762142e1fadefbbcf1150e6ccc5
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 Nov 2015 22:21:41 +0000 (4 14:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Nov 2015 22:21:41 +0000 (4 14:21 -0800)
tree03341b430fa2c5b5755cbf9feb635d3aacfd6751
parentaa826b651ae3012d1039453b36ed6f1eab939ef9
parent684fea37948d720cc69b3553b42353b4b42709dc
Sync with maint

* maint: