From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 4 Jun 2014 19:44:17 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~752
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8b8e565ce2045a953cb1ca311cdefe226d473425;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

Conflicts:
	wcfsetup/install/files/js/WCF.min.js
---

8b8e565ce2045a953cb1ca311cdefe226d473425