From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 31 Mar 2015 23:54:56 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.3~43^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=61572a61b1d6c37c22d02b9af5e3f0e09019b0ac;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

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

61572a61b1d6c37c22d02b9af5e3f0e09019b0ac