Merge branch 'maint'
commit66f467c3e6aa9c1e28eaf7b71cea5e452fc104e8
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Jul 2014 18:37:56 +0000 (10 11:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Jul 2014 18:37:56 +0000 (10 11:37 -0700)
treef80d89bcda33b9df7d8b53184c13c9342ec4f84b
parentda86971c2a88b71ed76d8c2f146ddac6dd86f896
parent8693e1cc2f0778954eb8aef5af9d98ac7b0c7dbb
Merge branch 'maint'

* maint:
  Start preparing for 2.0.2