From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 31 Jan 2015 10:57:18 +0000 (+0100)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Beta_4~21
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9eb0f03b1792a4a41490325807fce03be847565a;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

Conflicts:
	com.woltlab.wcf/package.xml
	wcfsetup/install/files/lib/system/WCF.class.php
---

9eb0f03b1792a4a41490325807fce03be847565a