Merge remote-tracking branch 'origin/next' into next
authorMarcel Werk <burntime@woltlab.com>
Sat, 2 Apr 2016 19:57:25 +0000 (21:57 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 2 Apr 2016 19:57:25 +0000 (21:57 +0200)
commite8d1a8922217704d4a8cb26962600698232ab1cd
tree2f08bfd437cc9f970293a56298536cb5bcc41dad
parent3fd6b1250cb5d2b4f022e2d4f7feb3f469e49c80
parent4b4bdfd756d2bcb902a9134a8cafa0728d7c0452
Merge remote-tracking branch 'origin/next' into next

# Conflicts:
# com.woltlab.wcf/page.xml
com.woltlab.wcf/page.xml
wcfsetup/install/files/lib/acp/form/PageAddForm.class.php
wcfsetup/install/files/lib/acp/form/PageEditForm.class.php
wcfsetup/install/files/lib/data/page/Page.class.php
wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
wcfsetup/setup/db/install.sql