Merge remote-tracking branch 'upstream/master'
authorTim Düsterhus <timwolla@arcor.de>
Mon, 6 May 2013 18:55:11 +0000 (20:55 +0200)
committerTim Düsterhus <timwolla@arcor.de>
Mon, 6 May 2013 18:55:11 +0000 (20:55 +0200)
commit5cd80fbe11829db2cdd805a380956e4b83b8e21c
treeb3cb7e8a16b1bade00e354aad4940085515126c3
parent4b9e43c5f2fa72f1a918488a5352e3f272ecc75f
parent8a52f0a47a9fa19345cda4b1f50f23dc9dde6231
Merge remote-tracking branch 'upstream/master'

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