From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 26 Apr 2015 17:16:15 +0000 (+0200)
Subject: Merge branch 'master' of github.com:WoltLab/WCF
X-Git-Tag: 2.1.4~44
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cc3e525830c29c19e5202d62d04e534fec71fa45;p=GitHub%2FWoltLab%2FWCF.git

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

cc3e525830c29c19e5202d62d04e534fec71fa45