From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 8 Apr 2015 12:24:49 +0000 (+0200)
Subject: Merge branch 'master' of github.com:WoltLab/WCF
X-Git-Tag: 2.1.3~29
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=419d8d3635495c0ae40b1f12117da623986be365;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' of github.com:WoltLab/WCF
---

419d8d3635495c0ae40b1f12117da623986be365