Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 26 May 2013 12:47:56 +0000 (14:47 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 26 May 2013 12:47:56 +0000 (14:47 +0200)
commit7ffa102f2c26e3aa154afda6dac4d5168d5b5721
tree5344c0950cd3a1f70cb93b501ceef073946ce619
parent7227b79a6512bee5c8b1fe0d4a59a3c864aa10f3
parent862875ab9e9494529317c7c05e20069c8a9e695a
Merge branch 'master' of github.com:WoltLab/WCF

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