Merge branch 'maint'

Junio C Hamano committed Nov 27, 2012 at 13:29 UTC b7973fbbc3f8f72df352f4ef1a2ff325db92c36f

No changes.