Merge branch 'master' of git://github.com/WoltLab/WCF into enhancement/packageInstall...
authorMatthias Schmidt <gravatronics@live.com>
Sun, 7 Oct 2012 13:32:53 +0000 (15:32 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 7 Oct 2012 13:32:53 +0000 (15:32 +0200)
Conflicts:
wcfsetup/install/files/lib/system/package/plugin/StyleAttributePackageInstallationPlugin.class.php

1  2 
wcfsetup/install/files/lib/system/package/plugin/ObjectTypeDefinitionPackageInstallationPlugin.class.php