Merge branch 'maint'

Junio C Hamano committed Jan 20, 2013 at 17:27 UTC 57a011197e9cbf2b7d63302ce9e53db30021d773

No changes.