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

Merge branch 'master' into next
---

a5a8fdde4c306948c8029d20bdde3cbf2cb6a0d4