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)
commit7a7c9ea47e437ade552cf31610d17b3e6714a2e9
tree3cdc6bfbf5c9045f7393dea0f0227ec6e949cfae
parentf249f4b9f703f54022e1229efefa7ca8a9c998eb
parenta5f4e4d9bf43836826bd5d2e337c07dfb280a5f0
Merge branch 'email' into next
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml