From: Matthias Schmidt <gravatronics@live.com>
Date: Tue, 1 Jul 2014 19:10:31 +0000 (+0200)
Subject: Merge branch 'refs/heads/2.0'
X-Git-Tag: 2.1.0_Alpha_1~639
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0eef0a99686872555a586842ef16a950172b9116;p=GitHub%2FWoltLab%2FWCF.git

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

0eef0a99686872555a586842ef16a950172b9116