From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 29 Nov 2015 11:45:02 +0000 (+0100)
Subject: Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia
X-Git-Tag: 3.0.0_Beta_1~2030^2~230
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=121dbf5982975c835e25b03a9514af3ac2207c60;p=GitHub%2FWoltLab%2FWCF.git

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

121dbf5982975c835e25b03a9514af3ac2207c60