From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 31 May 2014 11:38:49 +0000 (+0200)
Subject: Merge branch 'refs/heads/2.0'
X-Git-Tag: 2.1.0_Alpha_1~774
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d63187c9ae8f5cec7764f492fed921d68cb8e92d;p=GitHub%2FWoltLab%2FWCF.git

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

d63187c9ae8f5cec7764f492fed921d68cb8e92d