From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Sun, 24 May 2015 12:47:46 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~2324
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=62cf4d89852072bc840f5c212c132cec3878ebd6;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

62cf4d89852072bc840f5c212c132cec3878ebd6