Merge branch 'mh/attr-macro-doc'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:44:04 +0000 (10:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:44:04 +0000 (10:44 -0800)
* mh/attr-macro-doc:
gitattributes: document more clearly where macros are allowed

Trivial merge