From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 6 Jul 2014 17:42:29 +0000 (+0200)
Subject: Merge branch 'refs/heads/2.0'
X-Git-Tag: 2.1.0_Alpha_1~612
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bb1e46ab2ebc528b0be669c12a3b516bd57d6d1b;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'refs/heads/2.0'
---

bb1e46ab2ebc528b0be669c12a3b516bd57d6d1b