From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 20 Jun 2015 12:25:55 +0000 (+0200)
Subject: Merge branch 'next' of github.com:WoltLab/WCF into next
X-Git-Tag: 3.0.0_Beta_1~2261
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8750aa2a26024ea74683b5c70aa50df19f2e7d3b;p=GitHub%2FWoltLab%2FWCF.git

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

8750aa2a26024ea74683b5c70aa50df19f2e7d3b