Merge branch 'maint'

Junio C Hamano committed Oct 2, 2012 at 13:47 UTC b65f30b6b3bf34831b32a1b209bc1955f2bf79df

No changes.