From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Sun, 3 Jan 2016 12:39:38 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~2070
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=061187279d5f1586680de8555c757bc6e077cc2e;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

061187279d5f1586680de8555c757bc6e077cc2e