Merge branch 'maint'

* maint: Start preparing for 1.8.4.1

Junio C Hamano committed Sep 18, 2013 at 12:08 UTC eeaee045c85719821e685a22603a645a0ea85bad

No changes.