Merge branch 'maint'

Junio C Hamano committed Nov 28, 2012 at 13:49 UTC 226dcb52565b58952b78fb107d8d9def3ca396ab

No changes.