Merge branch 'hg/maint-attr-fix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:37:05 +0000 (22:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:37:05 +0000 (22:37 -0700)
* hg/maint-attr-fix:
attr: Expand macros immediately when encountered.
attr: Allow multiple changes to an attribute on the same line.
attr: Fixed debug output for macro expansion.

Trivial merge