Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Jul 2014 18:37:56 +0000 (11:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Jul 2014 18:37:56 +0000 (11:37 -0700)
* maint:
Start preparing for 2.0.2

Trivial merge