From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 30 Aug 2015 19:21:22 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.7~10
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1a14b6596f1ae0800728038d4e42e91beb38b087;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

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

1a14b6596f1ae0800728038d4e42e91beb38b087