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

author Alexander Ebert <ebert@woltlab.com>

Wed, 24 Apr 2013 15:05:52 +0000 (17:05 +0200)

committer Alexander Ebert <ebert@woltlab.com>

Wed, 24 Apr 2013 15:05:52 +0000 (17:05 +0200)
author Alexander Ebert <ebert@woltlab.com>
Wed, 24 Apr 2013 15:05:52 +0000 (17:05 +0200)
committer Alexander Ebert <ebert@woltlab.com>
Wed, 24 Apr 2013 15:05:52 +0000 (17:05 +0200)
diff --cc com.woltlab.wcf/acpMenu.xml
Simple merge
diff --cc wcfsetup/install/files/acp/templates/packageList.tpl
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>
	Wed, 24 Apr 2013 15:05:52 +0000 (17:05 +0200)
committer	Alexander Ebert <ebert@woltlab.com>
	Wed, 24 Apr 2013 15:05:52 +0000 (17:05 +0200)
		1	2
com.woltlab.wcf/acpMenu.xml	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/acp/templates/packageList.tpl	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