From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 3 Sep 2015 08:36:12 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.7~6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9d9d0969489780b649d648e6c9899165252414d3;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

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

9d9d0969489780b649d648e6c9899165252414d3