From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Wed, 13 May 2015 18:16:08 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~2399
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8f0eab5ac667ccb3572fa249be433ffa74c75cdb;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

8f0eab5ac667ccb3572fa249be433ffa74c75cdb