From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 30 May 2014 18:57:16 +0000 (+0200)
Subject: Merge branch 'refs/heads/2.0'
X-Git-Tag: 2.1.0_Alpha_1~778
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=454294f341e12d2ef14dc8a44123ee82054aca6e;p=GitHub%2FWoltLab%2FWCF.git

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

454294f341e12d2ef14dc8a44123ee82054aca6e