From: Matthias Schmidt <gravatronics@live.com>
Date: Wed, 26 Mar 2014 18:58:11 +0000 (+0100)
Subject: Merge branch 'refs/heads/2.0'
X-Git-Tag: 2.1.0_Alpha_1~954
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=06acf7aa44ca91822c716bcf85489da9b8c77837;p=GitHub%2FWoltLab%2FWCF.git

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

06acf7aa44ca91822c716bcf85489da9b8c77837