From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 18 May 2015 11:29:06 +0000 (+0200)
Subject: Merge branch 'next' of github.com:WoltLab/WCF into next
X-Git-Tag: 3.0.0_Beta_1~2396
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=147c9275192e6fb29ce93c8651103009ae81f1ad;p=GitHub%2FWoltLab%2FWCF.git

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

147c9275192e6fb29ce93c8651103009ae81f1ad