Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 21 Feb 2015 17:26:57 +0000 (18:26 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 21 Feb 2015 17:26:57 +0000 (18:26 +0100)
commit10a6175f8e816767ff03f85955dea69282603fcd
tree75276636b2c7af42173e71d608383ed62116dcfe
parent9746fb94e8d571edeee5254453ffb30e6ed2c044
parentcbf5e8288c51d834de75ccf3c887ca6d5c76f180
Merge branch '2.0'

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