Merge branch 'maint'

Junio C Hamano committed Jan 11, 2013 at 18:33 UTC 06fb494474fac626a410005c7d5364626153c69f

No changes.