Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Wed, 12 Aug 2015 17:04:58 +0000 (19:04 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 12 Aug 2015 17:04:58 +0000 (19:04 +0200)
commit6f0e164705e2be44639b15f68a5309bcef6ca253
treece37369e17f6fcd89788b38d875fe8fec2269c18
parenta5a8fdde4c306948c8029d20bdde3cbf2cb6a0d4
parent5595e7cc54eb627eae4fd6a189b27fd40ce309da
Merge branch 'master' into next
wcfsetup/install/files/acp/templates/styleAdd.tpl
wcfsetup/install/lang/en.xml