From: Matthias Schmidt <gravatronics@live.com>
Date: Tue, 2 Sep 2014 18:59:51 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~355
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4e861fd00061ca9828f89739a73dce91bf6d3d4f;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'
---

4e861fd00061ca9828f89739a73dce91bf6d3d4f