From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 2 Nov 2011 14:12:45 +0000 (+0100)
Subject: Merge branch 'master' of github.com:WoltLab/WCF
X-Git-Tag: 2.0.0_Beta_1~1635
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a7815f15b8e58010a3fc9679cdbcccc5a96ffa25;p=GitHub%2FWoltLab%2FWCF.git

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

Conflicts:
	wcfsetup/install/files/js/WCF.js
---

a7815f15b8e58010a3fc9679cdbcccc5a96ffa25