From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 7 Jul 2015 12:24:46 +0000 (+0200)
Subject: Merge branch 'next' into next-redactor
X-Git-Tag: 3.0.0_Beta_1~2219
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b4797c2f7bd16e682c8d9922ac3c548affb84100;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'next' into next-redactor

Conflicts:
	wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
---

b4797c2f7bd16e682c8d9922ac3c548affb84100