Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Tue, 27 Jan 2015 16:03:58 +0000 (17:03 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 27 Jan 2015 16:03:58 +0000 (17:03 +0100)
commitfc8eed2efff3a9d36c5d6e0976260f557596565d
treec3a2f9f669307b930dbde6dc60004fb038027e31
parent24850b5e3868720ffbfa9357cd5e26c83da372b7
parent9036579c51a53736bffb6cdee88368d5e2e149d8
Merge branch '2.0'

Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/js/WCF.js
wcfsetup/install/files/js/WCF.min.js
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/system/WCF.class.php