Merge branch 'maint'

* maint: More topics for 2.8.4

Junio C Hamano committed May 31, 2016 at 14:12 UTC 257f6f404bbb90512262dbb6f7f873a61bf381dc

No changes.