Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Tue, 31 Mar 2015 23:54:56 +0000 (01:54 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 31 Mar 2015 23:54:56 +0000 (01:54 +0200)
commit61572a61b1d6c37c22d02b9af5e3f0e09019b0ac
tree39a13e87a217b754183767c7b0d201f48c203ed5
parentf5100c710743e7d62ec1d17a981d65ec3fbe521a
parent7ed0a587ce0bef29579011c72cbcfcfe52b6dc12
Merge branch '2.0'

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