Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 31 Jan 2015 10:57:18 +0000 (11:57 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 31 Jan 2015 10:57:18 +0000 (11:57 +0100)
commit9eb0f03b1792a4a41490325807fce03be847565a
treeb9429c1b675be83048b1ea0acad907872a799199
parent94220501822dbc301831afa1e50cd53659020cf9
parent0f8190037a85c506cab938f61bdffe0974d01fc3
Merge branch '2.0'

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