From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 27 Jun 2016 13:21:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into next
X-Git-Tag: 3.0.0_Beta_1~1343
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1ead3c261af12c8e83f7e501a7a17a3da6561f68;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'origin/next' into next
---

1ead3c261af12c8e83f7e501a7a17a3da6561f68