From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 24 Jun 2015 17:28:30 +0000 (+0200)
Subject: Merge branch 'next' of github.com:WoltLab/WCF into next
X-Git-Tag: 3.0.0_Beta_1~2249
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=be2de5e3cdd2dd6fe9c124e41c92f249b88e6c40;p=GitHub%2FWoltLab%2FWCF.git

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

be2de5e3cdd2dd6fe9c124e41c92f249b88e6c40