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

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

2c1278e8038b16b8f3bcc760fa4e76d5e50cbcdd