From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 26 Feb 2015 13:38:59 +0000 (+0100)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0~20
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9f496044435aaa9942bcdc7703045a4a1ccd179b;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

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

9f496044435aaa9942bcdc7703045a4a1ccd179b