From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 5 Jan 2012 15:47:09 +0000 (+0100)
Subject: Merge branch 'master' of github.com:WoltLab/WCF
X-Git-Tag: 2.0.0_Beta_1~1445^2~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4b99412de44508aae35776150e947e446839d26a;p=GitHub%2FWoltLab%2FWCF.git

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

4b99412de44508aae35776150e947e446839d26a