Merge branch '2.0'

author Alexander Ebert <ebert@woltlab.com>

Tue, 23 Sep 2014 18:41:14 +0000 (20:41 +0200)

committer Alexander Ebert <ebert@woltlab.com>

Tue, 23 Sep 2014 18:41:14 +0000 (20:41 +0200)
author Alexander Ebert <ebert@woltlab.com>
Tue, 23 Sep 2014 18:41:14 +0000 (20:41 +0200)
committer Alexander Ebert <ebert@woltlab.com>
Tue, 23 Sep 2014 18:41:14 +0000 (20:41 +0200)
diff --cc wcfsetup/install/files/acp/js/WCF.ACP.js
Simple merge
diff --cc wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/system/package/PackageInstallationScheduler.class.php
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Tue, 23 Sep 2014 18:41:14 +0000 (20:41 +0200)
committer	Alexander Ebert <ebert@woltlab.com>
	Tue, 23 Sep 2014 18:41:14 +0000 (20:41 +0200)
		1	2
wcfsetup/install/files/acp/js/WCF.ACP.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/PackageInstallationScheduler.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/de.xml	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/en.xml	patch \|	diff1 \|	diff2 \|	blob \| history