Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Wed, 16 Apr 2014 20:27:54 +0000 (22:27 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 16 Apr 2014 20:27:54 +0000 (22:27 +0200)
commit5acec772e05f56b1821f8cd8107d29204180edbf
tree7e06e23c54153cb4f96d6a38c938ffecb81b11ef
parent6699003282976333a3f9a4ebab2cbea63cff6e6d
parent242857e27ff3ca4e24a96f25b4c279a897f3b987
Merge branch '2.0'
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml