Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 2 Jul 2015 08:52:16 +0000 (10:52 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 2 Jul 2015 08:52:16 +0000 (10:52 +0200)
commit44de21b4575e398b89491200396ef17ac6404000
tree2d75315dba3252d0792a2245b4595414d0d75258
parente5c2467f717632b47f935a0e59a310de2e2867f3
parent49c6afa3e13c74bbd3aa4629473b908fad40689a
Merge branch 'master' into next

Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml