Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Tue, 3 Jun 2014 18:55:01 +0000 (20:55 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 3 Jun 2014 18:55:01 +0000 (20:55 +0200)
commit70f27f4e4b6aca633389f9de6c0cf73c60d5c9f6
tree503b16dd095aad11ae85be089a602be65646c4a6
parent48f399248f2c6f179364fc4ec212fffb4190e57f
parentd180e07649ab108f4c63f8591639027beb060b02
Merge branch '2.0'

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