Merge branch '2.0'

author Alexander Ebert <ebert@woltlab.com>

Sat, 20 Sep 2014 11:53:26 +0000 (13:53 +0200)

committer Alexander Ebert <ebert@woltlab.com>

Sat, 20 Sep 2014 11:53:26 +0000 (13:53 +0200)
author Alexander Ebert <ebert@woltlab.com>
Sat, 20 Sep 2014 11:53:26 +0000 (13:53 +0200)
committer Alexander Ebert <ebert@woltlab.com>
Sat, 20 Sep 2014 11:53:26 +0000 (13:53 +0200)
diff --cc com.woltlab.wcf/templates/header.tpl
Simple merge
diff --cc wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Sat, 20 Sep 2014 11:53:26 +0000 (13:53 +0200)
committer	Alexander Ebert <ebert@woltlab.com>
	Sat, 20 Sep 2014 11:53:26 +0000 (13:53 +0200)
		1	2
com.woltlab.wcf/templates/header.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php	patch \|	diff1 \|	diff2 \|	blob \| history