Merge branch 'maint'

Junio C Hamano committed Sep 14, 2012 at 21:38 UTC 66c349027b18d36d13c5a0d798e51aa183d7eacd

No changes.