From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 2 Jul 2015 13:52:26 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~2219^2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7cd010563719c6591beea7198a79e1870f5f7573;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next

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

7cd010563719c6591beea7198a79e1870f5f7573