From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 5 Oct 2014 14:00:13 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~271
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=857e856d79d74efef8200bd2b3269a53645e5910;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

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

857e856d79d74efef8200bd2b3269a53645e5910