Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 28 Jun 2013 16:21:10 +0000 (18:21 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 28 Jun 2013 16:21:10 +0000 (18:21 +0200)
commitc16c09161198a025fb938a8e8489daa1680847dc
treeb215f2fd504c08ceda93f08dfd4243eb69ecae6b
parentf5c0bcb765ae2c752da16663dfba77453fe47027
parent340221a0be14dc1fc78512d305853631827ab735
Merge branch 'master' of github.com:WoltLab/WCF

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