Merge branch 'next' into next-redactor

author Alexander Ebert <ebert@woltlab.com>

Thu, 2 Jul 2015 08:52:37 +0000 (10:52 +0200)

committer Alexander Ebert <ebert@woltlab.com>

Thu, 2 Jul 2015 08:52:37 +0000 (10:52 +0200)
author Alexander Ebert <ebert@woltlab.com>
Thu, 2 Jul 2015 08:52:37 +0000 (10:52 +0200)
committer Alexander Ebert <ebert@woltlab.com>
Thu, 2 Jul 2015 08:52:37 +0000 (10:52 +0200)
diff --cc wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
Simple merge
diff --cc wcfsetup/install/files/js/3rdParty/redactor/plugins/wmonkeypatch.js
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Thu, 2 Jul 2015 08:52:37 +0000 (10:52 +0200)
committer	Alexander Ebert <ebert@woltlab.com>
	Thu, 2 Jul 2015 08:52:37 +0000 (10:52 +0200)
		1	2
wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/js/3rdParty/redactor/plugins/wmonkeypatch.js	patch \|	diff1 \|	diff2 \|	blob \| history