From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 22 Jun 2015 16:34:57 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~2249^2~10
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d856d12e0ce74bd00dd8640f996fdac17010b952;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

d856d12e0ce74bd00dd8640f996fdac17010b952