Sync with maint
commit74301d6edeb0e081a4ef864057952b6a7ff2b4be
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Oct 2015 22:29:57 +0000 (20 15:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Oct 2015 22:29:57 +0000 (20 15:29 -0700)
treef64ff7da9651848e38253bc2de5135dc45186578
parentbca92e88e7d5c95ef6d38d6966f5e7a11969c7d2
parentb05c2f9ed48adfd9670b28ecdd5c55a4e4698704
Sync with maint

* maint: