Merge branch '2.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 4 Jun 2015 23:14:34 +0000 (01:14 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 4 Jun 2015 23:16:35 +0000 (01:16 +0200)
commiteffd1f4a650a80e89a3a1f4f23c7cab9581eb2f2
tree9ebbc92c39feb1042cef62ba6834ee52b136a098
parent3670d6d33defb5c742c931702128de1b05729304
parent6b354f796060ebd4f649c243e76de576e264f6a6
Merge branch '2.0'
wcfsetup/install/lang/en.xml
wcfsetup/setup/lang/setup_en.xml