From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Sun, 1 Feb 2015 18:06:57 +0000 (+0100)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Beta_4~8^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0f740d6a4452cb7680380fc1a85588067a8993fd;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

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

0f740d6a4452cb7680380fc1a85588067a8993fd