Merge branch 'maint'

Junio C Hamano committed Dec 22, 2012 at 20:40 UTC 86c3e6ed515d5e3bfca1d515c607db55ba032d71

No changes.