Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 25 Apr 2013 13:27:57 +0000 (15:27 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 25 Apr 2013 13:27:57 +0000 (15:27 +0200)
commite237fb1ea9b9f0ec75059b004c6b725a3af147e0
tree5c2d2ea42760f5dd9ed4d67f3ed196fe0c4a9e8b
parent6570e38e96efa249c0dd4dffe90410790ae465e9
parenteb69a2e939c5e5ee9b17c179e49c70f1d239de82
Merge branch 'master' of github.com:WoltLab/WCF
com.woltlab.wcf/acpMenu.xml
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
wcfsetup/setup/db/install.sql