Merge branch 'mh/attr-macro-doc'

* mh/attr-macro-doc: gitattributes: document more clearly where macros are allowed

Junio C Hamano committed Jan 27, 2014 at 10:44 UTC ac355298b1bf8ba46aeb4aa7247b470d77ab5631

No changes.