Merge branch 'vhostalias' of /home/git/repositories/renky/ispconfig3

Dominik Müller

2014-01-19 6e8071c5e2eb86a280180638a73ad80e7264f133

 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'}