Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 17 Sep 2014 15:12:02 +0000 (17:12 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 17 Sep 2014 15:12:02 +0000 (17:12 +0200)
commit50970626e74309792f1e8e3509fd26d1b02d8e96
treed9c386544b300f63771a5431d70d246e3225fc7b
parent4d8036f523edd1e53df7e06db1e291fb50ec0fa3
parent39d6e6025cb9ce356b18ac23bc0a4d3311b30dc8
Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
com.woltlab.wcf/acpMenu.xml
com.woltlab.wcf/option.xml
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml