Merge branch 'maint'
commit2c78c91db7fdcc836db869d05d8274c840a07742
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 May 2012 17:45:47 +0000 (10 10:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 May 2012 17:45:47 +0000 (10 10:45 -0700)
treea968196189f531b6a3fadf18285939c3f3c76a9f
parenta3935e6791c619a9f2f472e9e553d45d88c4e263
parent5ad3e16a6f075deff3cddd6d12ae89fafb0c718d
Merge branch 'maint'