From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 26 Jul 2014 08:32:29 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~537
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=061c3b2e201c721ea83c3c92d7c941637f6b8a7d;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'
---

061c3b2e201c721ea83c3c92d7c941637f6b8a7d