From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Sat, 16 Apr 2016 10:21:16 +0000 (+0200)
Subject: Merge branch 'next' of github.com:WoltLab/WCF into next
X-Git-Tag: 3.0.0_Beta_1~1882
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6cc4ee91c1bd6a0d7482579e87b4c9373dba503e;p=GitHub%2FWoltLab%2FWCF.git

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

6cc4ee91c1bd6a0d7482579e87b4c9373dba503e