From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 29 Dec 2012 02:16:55 +0000 (+0100)
Subject: Merge branch 'master' of github.com:WoltLab/WCF
X-Git-Tag: 2.0.0_Beta_1~639^2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=34a49432bd98b81848fdfdae93a20e765f0b1836;p=GitHub%2FWoltLab%2FWCF.git

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

34a49432bd98b81848fdfdae93a20e765f0b1836