Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 26 Mar 2014 16:27:41 +0000 (17:27 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 26 Mar 2014 16:27:41 +0000 (17:27 +0100)
commitccef34860c841a3b5433cc06cb41d45ef7264089
treee7c7b841b85ca5c14943e04246766da9d78d17f4
parent647741fde035e84723a1df760d8d19ad17e47ea4
parenta2083068a4e29af2dbe940763b127eb2bee551d7
Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
com.woltlab.wcf/templates/user.tpl
com.woltlab.wcf/templates/user.tpl
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml