From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 26 Mar 2016 21:11:14 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~1286^2~27
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3232aca88f49305057ed21325cd058ea16889293;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

3232aca88f49305057ed21325cd058ea16889293