[FIX] Revert automatic merge changes to wikiplugin_tracker as part of r63606
[FIX] Revert automatic merge changes to wikiplugin_tracker as part of r63606


git-svn-id: a7fabbc6a7c54ea5c67cbd16bd322330fd10cc35@63643 b456876b-0849-0410-b77d-98878d47e9d5

tikiorg/tiki,tikiorg/tiki,tikiorg/tiki,tikiorg/tiki