Merge branch 'maint'

Junio C Hamano committed Dec 13, 2012 at 11:13 UTC 790c83cda92f95f1b4b91e2ddc056a52a99a055d

No changes.