From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 17 Nov 2015 12:59:21 +0000 (+0100)
Subject: Merge branch 'refs/heads/next-php-di' into next-lantia
X-Git-Tag: 3.0.0_Beta_1~2030^2~247
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cd672bb5408b8e43ab8eeb186e900ac0001b2fe3;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'refs/heads/next-php-di' into next-lantia
---

cd672bb5408b8e43ab8eeb186e900ac0001b2fe3