From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 3 Jun 2015 17:10:29 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~2289
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e4847d8924f80ce075c2651055af308dde01f4a6;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

e4847d8924f80ce075c2651055af308dde01f4a6