From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 22 May 2015 18:07:25 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~2352
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=89b3783b67602a45ae38f99ceccf434fcd28b0d2;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

89b3783b67602a45ae38f99ceccf434fcd28b0d2