Merge pull request #2139 from woouki/master

author Marcel Werk <burntime@woltlab.com>

Sat, 26 Nov 2016 13:44:36 +0000 (14:44 +0100)

committer GitHub <noreply@github.com>

Sat, 26 Nov 2016 13:44:36 +0000 (14:44 +0100)
author Marcel Werk <burntime@woltlab.com>
Sat, 26 Nov 2016 13:44:36 +0000 (14:44 +0100)
committer GitHub <noreply@github.com>
Sat, 26 Nov 2016 13:44:36 +0000 (14:44 +0100)
diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
author	Marcel Werk <burntime@woltlab.com>
	Sat, 26 Nov 2016 13:44:36 +0000 (14:44 +0100)
committer	GitHub <noreply@github.com>
	Sat, 26 Nov 2016 13:44:36 +0000 (14:44 +0100)
		1	2
wcfsetup/install/lang/de.xml	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/en.xml	patch \|	diff1 \|	diff2 \|	blob \| history