Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 4 Nov 2012 02:13:18 +0000 (03:13 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 4 Nov 2012 02:13:18 +0000 (03:13 +0100)
commitecf0450ba28b8ce167535dbbc5e341530e8e9fe2
treee2c444f95c59cb27b921804c0c1b84d7fd3b703e
parent668cf125c131e6700e77b062f28421463f204083
parenta9a6b35aced500eb46b763aa9bab4e4046f92737
Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/de.xml