From: Marcel Werk Date: Fri, 13 Jan 2012 17:57:52 +0000 (+0100) Subject: Merge branch 'master' of github.com:WoltLab/WCF X-Git-Tag: 2.0.0_Beta_1~1428 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=faf3acba987299f57b134d29216316765ea8e65e;p=GitHub%2FWoltLab%2FWCF.git Merge branch 'master' of github.com:WoltLab/WCF --- faf3acba987299f57b134d29216316765ea8e65e