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

Merge branch 'master' into next
---

0e6ca348acb8d9fc01bd9d2063ed3385c6320e9b