From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 4 May 2014 23:46:47 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~845^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=315390f71640d2d7a8de06505b00c762b66f1fa5;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

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

315390f71640d2d7a8de06505b00c762b66f1fa5