Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 May 2012 22:37:28 +0000 (15:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 May 2012 22:37:28 +0000 (15:37 -0700)
commit16798d0f48c64c4d967c1598a6748ff8c1b87112
tree566b6d7db549e6720af66801fb03fdae906b8fe6
parent4c732da91cea2156979a0cc73cc772ef024e7b9a
parentedf141218e4e4ecca3a8ab0c8fa9eafe381b3838
Merge branch 'maint'

* maint: