fixing up some previous commits to avoid duplicate and to use cleaner wiki plugin syntax
fixing up some previous commits to avoid duplicate and to use cleaner wiki plugin syntax

git-svn-id: 9bac41f8ebc9458fc3e28d41abfab39641e8bd1c@29914 b456876b-0849-0410-b77d-98878d47e9d5

tikiorg/tiki,changi67/tiki,changi67/tiki,tikiorg/tiki,oregional/tiki,tikiorg/tiki,changi67/tiki,oregional/tiki,oregional/tiki,changi67/tiki,tikiorg/tiki,changi67/tiki,oregional/tiki