Merge branch '2.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 2 Sep 2014 18:46:16 +0000 (20:46 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 2 Sep 2014 18:46:16 +0000 (20:46 +0200)
commitfc2c9e888a167fd5c14af8d44b209d67be23c824
treeb4229b8b838976d57da8ce9c17b9683f3e4f9538
parent46dbe68bcc439e58274f9506b6ceb3b2ea6672b2
parente5f817d14bd7fc475c520f3ddc3494c64ba42334
Merge branch '2.0'

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