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

Merge branch 'master' into next
---

06396ef870fb428acb8477d33767da6b8d347a34