Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Wed, 11 Jun 2014 22:25:59 +0000 (00:25 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 11 Jun 2014 22:25:59 +0000 (00:25 +0200)
commita24a89e477c62f3eccfc9386006dd242d531dda2
treebf89876c57f12fc61512a6b0ba4169c209b9a57a
parent3feaaa44af16a91e47a58e8751635056aca4856b
parent51c20f869d14c014a595b514a8f26e29b274abd1
Merge branch '2.0'

Conflicts:
com.woltlab.wcf/userGroupOption.xml
wcfsetup/install/lang/en.xml
com.woltlab.wcf/userGroupOption.xml
com.woltlab.wcf/userOption.xml
wcfsetup/install/lang/en.xml