Merge branch 'maint'

Junio C Hamano committed Sep 12, 2012 at 14:36 UTC 0577c59af804d78ef8b8125087e592580dacdf6f

No changes.