Merge branch 'master' of git://github.com/WoltLab/WCF into WoltLab-master
authorTim Düsterhus <timwolla@arcor.de>
Thu, 2 May 2013 14:56:35 +0000 (16:56 +0200)
committerTim Düsterhus <timwolla@arcor.de>
Thu, 2 May 2013 14:56:35 +0000 (16:56 +0200)
commit03b2597eac7c5aac4a2f81307becb9a81e787d37
tree5d2d49fd23851eb8846775c5c2f1b0c301b4a16a
parent9a24b0ffc89671f6ea2d8f35ce1639b4e39e8702
parent11cf19be278579e493e8b32b52f1d3b18ebebc24
Merge branch 'master' of git://github.com/WoltLab/WCF into WoltLab-master

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