From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 12 Jul 2015 17:40:54 +0000 (+0200)
Subject: Merge branch 'next' of github.com:WoltLab/WCF into next
X-Git-Tag: 3.0.0_Beta_1~2177
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=93b38a27ef188ecf094428ca3d960890c7f201e3;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'next' of github.com:WoltLab/WCF into next

Conflicts:
	wcfsetup/install/files/acp/templates/header.tpl
---

93b38a27ef188ecf094428ca3d960890c7f201e3