From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 21 May 2013 13:30:30 +0000 (+0200)
Subject: Merge branch 'master' of github.com:WoltLab/WCF
X-Git-Tag: 2.0.0_Beta_1~99
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cb2012410be47bea4d800ffa2c80bb15df94c558;p=GitHub%2FWoltLab%2FWCF.git

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

Conflicts:
	com.woltlab.wcf/template/userPanel.tpl
---

cb2012410be47bea4d800ffa2c80bb15df94c558