From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 25 Mar 2016 07:52:29 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~1286^2~55
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1c56d6adb3cd7e2a566b8f5c1cc0f853be04fa7a;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

1c56d6adb3cd7e2a566b8f5c1cc0f853be04fa7a