From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Fri, 25 Mar 2016 22:56:50 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~1286^2~40
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b9c0b78486feb74a24ee8f57983a392b50a89b40;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

b9c0b78486feb74a24ee8f57983a392b50a89b40