From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 3 Jun 2014 18:55:01 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~756
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=70f27f4e4b6aca633389f9de6c0cf73c60d5c9f6;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

Conflicts:
	wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wbbcode/plugin.js
	wcfsetup/install/files/lib/system/WCF.class.php
---

70f27f4e4b6aca633389f9de6c0cf73c60d5c9f6