Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 24 Apr 2013 15:05:52 +0000 (17:05 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 24 Apr 2013 15:05:52 +0000 (17:05 +0200)
commit989ba25e2973fc53f7c2de7118150083acf284ab
tree93061b40840bddd6cebbafaef748badc542fc773
parent3536d2fe3861c5da467bbff4ff42efb24c9ad9c3
parent3c58ae85a3286566332963414ec61b24b33c1e32
Merge branch 'master' of github.com:WoltLab/WCF
com.woltlab.wcf/acpMenu.xml
wcfsetup/install/files/acp/templates/packageList.tpl
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml