Merge branch 'master' of github.com:WoltLab/WCF

author Alexander Ebert <ebert@woltlab.com>

Sun, 8 Jan 2017 18:26:14 +0000 (19:26 +0100)

committer Alexander Ebert <ebert@woltlab.com>

Sun, 8 Jan 2017 18:26:14 +0000 (19:26 +0100)
author Alexander Ebert <ebert@woltlab.com>
Sun, 8 Jan 2017 18:26:14 +0000 (19:26 +0100)
committer Alexander Ebert <ebert@woltlab.com>
Sun, 8 Jan 2017 18:26:14 +0000 (19:26 +0100)
diff --cc wcfsetup/install/files/lib/system/email/Email.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/system/page/PageLocationManager.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>
	Sun, 8 Jan 2017 18:26:14 +0000 (19:26 +0100)
committer	Alexander Ebert <ebert@woltlab.com>
	Sun, 8 Jan 2017 18:26:14 +0000 (19:26 +0100)
		1	2
wcfsetup/install/files/lib/system/email/Email.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/page/PageLocationManager.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