From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 6 Aug 2015 19:26:27 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~2144
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ef0b2e5b1d05465917e765a6867e3de5dc64a7b4;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

ef0b2e5b1d05465917e765a6867e3de5dc64a7b4