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

Merge branch 'master' into next

Conflicts:
	com.woltlab.wcf/package.xml
	wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js
---

44de21b4575e398b89491200396ef17ac6404000