From: Matthias Schmidt <gravatronics@live.com>
Date: Thu, 27 Mar 2014 18:36:56 +0000 (+0100)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~942
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=29c061cfa4131e91fae1dd7d719fb52f7ce828ab;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'
---

29c061cfa4131e91fae1dd7d719fb52f7ce828ab