Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sat, 24 May 2014 11:12:02 +0000 (13:12 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 24 May 2014 11:12:02 +0000 (13:12 +0200)
commitf1a334772ceafdc8797ad60799dffbba301480ee
treeb5c635b294c374e44311be44f3d8b8d01e8885df
parentc3ab3fe06ddfa2e6ec3b4169de47948288bb9ed6
parent9a5b838debc2ba51ed226179cc39c67a2fb90611
Merge branch 'master' of github.com:WoltLab/WCF
com.woltlab.wcf/userGroupOption.xml
wcfsetup/install/lang/de.xml
wcfsetup/setup/db/install.sql