Merge pull request #670 from Gravatronics/enhancement/previewLanguageItem

author Alexander Ebert <ebert@woltlab.com>

Thu, 12 Jul 2012 14:18:08 +0000 (07:18 -0700)

committer Alexander Ebert <ebert@woltlab.com>

Thu, 12 Jul 2012 14:18:08 +0000 (07:18 -0700)
author Alexander Ebert <ebert@woltlab.com>
Thu, 12 Jul 2012 14:18:08 +0000 (07:18 -0700)
committer Alexander Ebert <ebert@woltlab.com>
Thu, 12 Jul 2012 14:18:08 +0000 (07:18 -0700)
diff --cc com.woltlab.wcf/template/headInclude.tpl
Simple merge
diff --cc wcfsetup/install/files/acp/templates/header.tpl
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Thu, 12 Jul 2012 14:18:08 +0000 (07:18 -0700)
committer	Alexander Ebert <ebert@woltlab.com>
	Thu, 12 Jul 2012 14:18:08 +0000 (07:18 -0700)
		1	2
com.woltlab.wcf/template/headInclude.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/acp/templates/header.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/de.xml	patch \|	diff1 \|	diff2 \|	blob \| history