Merge remote-tracking branch 'refs/remotes/origin/2.1'

author Alexander Ebert <ebert@woltlab.com>

Fri, 13 Jan 2017 16:06:35 +0000 (17:06 +0100)

committer Alexander Ebert <ebert@woltlab.com>

Fri, 13 Jan 2017 16:06:35 +0000 (17:06 +0100)
author Alexander Ebert <ebert@woltlab.com>
Fri, 13 Jan 2017 16:06:35 +0000 (17:06 +0100)
committer Alexander Ebert <ebert@woltlab.com>
Fri, 13 Jan 2017 16:06:35 +0000 (17:06 +0100)
diff --cc wcfsetup/install/files/lib/system/package/PackageInstallationScheduler.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Fri, 13 Jan 2017 16:06:35 +0000 (17:06 +0100)
committer	Alexander Ebert <ebert@woltlab.com>
	Fri, 13 Jan 2017 16:06:35 +0000 (17:06 +0100)
		1	2
wcfsetup/install/files/lib/system/package/PackageInstallationScheduler.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php	patch \|	diff1 \|	diff2 \|	blob \| history