From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 28 Jun 2013 16:21:10 +0000 (+0200)
Subject: Merge branch 'master' of github.com:WoltLab/WCF
X-Git-Tag: 2.0.0_Beta_5~118^2~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c16c09161198a025fb938a8e8489daa1680847dc;p=GitHub%2FWoltLab%2FWCF.git

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

Conflicts:
	com.woltlab.wcf/templates/wysiwygToolbar.tpl
	wcfsetup/install/files/lib/system/bbcode/BBCodeHandler.class.php
---

c16c09161198a025fb938a8e8489daa1680847dc