From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 1 Jun 2014 19:58:27 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~760
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a43e8b85638e581c67608a388557b90d605b8371;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

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

a43e8b85638e581c67608a388557b90d605b8371