Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Fri, 3 Jul 2015 11:03:15 +0000 (13:03 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 3 Jul 2015 11:03:15 +0000 (13:03 +0200)
commit083cc6022579dbe462344144f169d5a60d43a3c3
tree9f890090d69677afc9f2aae1e65c34c4e7da4a21
parent7cd010563719c6591beea7198a79e1870f5f7573
parent0b8f75d8cc749b193f98d220b6dbc640987ffdb2
Merge branch 'master' into next

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