From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 11 Feb 2015 15:23:15 +0000 (+0100)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_RC_1~33
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3d1b6923cd2cfd666d0714a9b1a051da64c8734e;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

Conflicts:
	wcfsetup/install/files/js/WCF.min.js
	wcfsetup/install/files/lib/system/WCF.class.php
---

3d1b6923cd2cfd666d0714a9b1a051da64c8734e