From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 2 Jun 2016 22:17:41 +0000 (+0200)
Subject: Merge branch 'next' of github.com:WoltLab/WCF into next
X-Git-Tag: 3.0.0_Beta_1~1538
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a110220a56bb538ab778f7c596c143ce0fa5d872;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'next' of github.com:WoltLab/WCF into next
---

a110220a56bb538ab778f7c596c143ce0fa5d872