Merge remote-tracking branch 'renky/vhostalias'

Marius Cramer

2014-01-24 e60d4c7e35e5dd3a5f4fb1d5b3a25345b6275146

 interface/web/admin/templates/system_config_sites_edit.htm

@@ -46,6 +46,12 @@
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='vhost_aliasdomains_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='vhost_aliasdomains'}&nbsp;{tmpl_var name='vhost_aliasdomains_note_txt'}
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='client_username_web_check_disabled_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='client_username_web_check_disabled'}