Merged [7024] from 0.11-stable (TracWikiMacros -> WikiMacros, ref. #7139).
Authored by: osimons 2008-05-08
Parent: [r7024]
Child: [r7026]