Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Sun, 30 Aug 2015 19:21:22 +0000 (21:21 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 30 Aug 2015 19:21:22 +0000 (21:21 +0200)
commit1a14b6596f1ae0800728038d4e42e91beb38b087
treed5f503ed257250aace7c8eca1c9a29bfbf738892
parentbb9d54bb3f038068f8422ab4360a82076e73e938
parente86dfec0225d88f4305560c0e9c29607ea01c6a5
Merge branch '2.0'

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