Sync with maint

* maint: attr: a note about the order of .gitattributes lookup

Junio C Hamano committed Oct 10, 2012 at 14:54 UTC 8d47dc7f2ddaa70b388fb3f739b9339de826a7fb

No changes.