From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 5 Jun 2015 22:51:59 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~2286
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=97df4723c10a0813d38558bec43efe88dfde832f;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

97df4723c10a0813d38558bec43efe88dfde832f