From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 25 Aug 2016 15:37:36 +0000 (+0200)
Subject: Merge branch 'next' of github.com:WoltLab/WCF into next
X-Git-Tag: 3.0.0_Beta_1~508
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=812d9c1cbd669e1a921b1d31038ce5b025ce7608;p=GitHub%2FWoltLab%2FWCF.git

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

812d9c1cbd669e1a921b1d31038ce5b025ce7608