Merge branch 'maint'
commit257f6f404bbb90512262dbb6f7f873a61bf381dc
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2016 21:12:08 +0000 (31 14:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2016 21:12:08 +0000 (31 14:12 -0700)
tree031f26bed9ae0ec54b9953bf9156ddb0840d557a
parent39fbe92248a7f312a1aec07eb5f9fcd735bb814b
parent4b0891ffe4ec3aef081cf48c5f9a747586076f7a
Merge branch 'maint'

* maint:
  More topics for 2.8.4