Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 26 Feb 2015 13:38:59 +0000 (14:38 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 26 Feb 2015 13:38:59 +0000 (14:38 +0100)
commit9f496044435aaa9942bcdc7703045a4a1ccd179b
tree13bf0691d3e0bfba29053ac183ef80877d889e0a
parentbe6cd0dd1b6cea95e795f826af749013c611b861
parentf7c80c04941a2e9b11e70b1723b028680a1cdc5c
Merge branch '2.0'

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