Merge remote-tracking branch 'refs/remotes/origin/next' into next-lantia

author Alexander Ebert <ebert@woltlab.com>

Sat, 24 Oct 2015 13:10:58 +0000 (15:10 +0200)

committer Alexander Ebert <ebert@woltlab.com>

Sat, 24 Oct 2015 13:10:58 +0000 (15:10 +0200)
author Alexander Ebert <ebert@woltlab.com>
Sat, 24 Oct 2015 13:10:58 +0000 (15:10 +0200)
committer Alexander Ebert <ebert@woltlab.com>
Sat, 24 Oct 2015 13:10:58 +0000 (15:10 +0200)
diff --cc wcfsetup/install/files/acp/templates/languageExport.tpl
Simple merge
diff --cc wcfsetup/install/files/js/WCF.js
Simple merge
diff --cc wcfsetup/install/files/js/WoltLab/WCF/Ui/Dialog.js
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Sat, 24 Oct 2015 13:10:58 +0000 (15:10 +0200)
committer	Alexander Ebert <ebert@woltlab.com>
	Sat, 24 Oct 2015 13:10:58 +0000 (15:10 +0200)
		1	2
wcfsetup/install/files/acp/templates/languageExport.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/js/WCF.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/js/WoltLab/WCF/Ui/Dialog.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/de.xml	patch \|	diff1 \|	diff2 \|	blob \| history