From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 20 Jun 2015 15:25:41 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~2259
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7be299d7a01e6472a1664e84358d706ecbe23128;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

7be299d7a01e6472a1664e84358d706ecbe23128