Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2013 19:08:38 +0000 (12:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2013 19:08:41 +0000 (12:08 -0700)
* maint:
Start preparing for 1.8.4.1

Trivial merge