Merge branch 'email' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 23 Jun 2015 22:32:36 +0000 (00:32 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 23 Jun 2015 22:32:36 +0000 (00:32 +0200)
1  2 
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

Simple merge
Simple merge