From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 15 May 2015 15:28:48 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~2396^2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=adc1abda82266eb1169939a72f6f7cb614667b96;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

adc1abda82266eb1169939a72f6f7cb614667b96