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

Merge branch '2.0'

Conflicts:
	com.woltlab.wcf/package.xml
---

10a6175f8e816767ff03f85955dea69282603fcd