From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 21 Dec 2015 20:40:29 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~2083
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fb4d85fff63d688069e0615177fa8959140bb87d;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

fb4d85fff63d688069e0615177fa8959140bb87d