From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 3 Jul 2015 11:03:15 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~2219^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=083cc6022579dbe462344144f169d5a60d43a3c3;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next

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

083cc6022579dbe462344144f169d5a60d43a3c3