Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 31 Jan 2015 10:39:33 +0000 (11:39 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 31 Jan 2015 10:39:33 +0000 (11:39 +0100)
commit94220501822dbc301831afa1e50cd53659020cf9
treeb9429c1b675be83048b1ea0acad907872a799199
parentc4f90256a676a2fc99e9873e74df105bc3b3c74e
parentaacc402b1c78cba1e4d20d4ddf08eca696656fca
Merge branch '2.0'

Conflicts:
wcfsetup/install/files/js/WCF.Moderation.min.js
wcfsetup/install/files/lib/system/package/PackageArchive.class.php
wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php
wcfsetup/install/files/lib/system/package/validation/PackageValidationManager.class.php