Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2016 21:12:08 +0000 (14:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2016 21:12:08 +0000 (14:12 -0700)
* maint:
More topics for 2.8.4

Trivial merge