From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 4 Jun 2015 15:33:45 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~2288
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8e69f2b448fd8d5cd3f7fdedcd36f47cd4fc2e45;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

8e69f2b448fd8d5cd3f7fdedcd36f47cd4fc2e45