Merge branch 'maint'

* maint:

Junio C Hamano committed May 3, 2012 at 15:37 UTC 16798d0f48c64c4d967c1598a6748ff8c1b87112

No changes.