Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 2 Jul 2015 13:52:26 +0000 (15:52 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 2 Jul 2015 13:52:26 +0000 (15:52 +0200)
commit7cd010563719c6591beea7198a79e1870f5f7573
tree56fd8c2bfe8c6f543b1664c3861db61994dc1e96
parent44de21b4575e398b89491200396ef17ac6404000
parent578ad8d9787fd429780b34e64b1337d53c4ed9df
Merge branch 'master' into next

Conflicts:
wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js