From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Sun, 13 Mar 2016 11:50:28 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~2039
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=652a2fcb9482017273c46d3597fbc599b24f84b8;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

652a2fcb9482017273c46d3597fbc599b24f84b8