Patches
Plain Diff
Conflicts: include/class_templateHandling.inc include/simpleplugin/class_simplePlugin.inc