ariatemplates/ariatemplates — pull request #687 by jakub-g (2013-08-23 15:58:57+00:00)
Title: feat #682 add 'macro' to @aria:Dialog as an alias to 'contentMacro'

To make API more consistent, let `macro` in @aria:Dialog be a synonym for `contentMacro`. `contentMacro` still takes precedence.