From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Tue, 2 Sep 2014 18:46:16 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~358
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fc2c9e888a167fd5c14af8d44b209d67be23c824;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

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

fc2c9e888a167fd5c14af8d44b209d67be23c824