From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 26 Jun 2015 18:30:25 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~2234
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=82c6ba6133077402dd9bc20da6d6462fa1194d1a;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
	wcfsetup/install/files/lib/system/WCF.class.php
---

82c6ba6133077402dd9bc20da6d6462fa1194d1a