From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 28 Jul 2016 11:02:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into next
X-Git-Tag: 3.0.0_Beta_1~943
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=508f5a80d19720617e3c81858d00e188b9947d74;p=GitHub%2FWoltLab%2FWCF.git

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

508f5a80d19720617e3c81858d00e188b9947d74