Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 interface/web/admin/templates/system_config_sites_edit.htm

@@ -45,10 +45,16 @@
                    {tmpl_var name='vhost_subdomains'} {tmpl_var name='vhost_subdomains_note_txt'}
                </div>
            </div>
         <div class="ctrlHolder">
            <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'}
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='reseller_can_use_options_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='reseller_can_use_options'}
                </div>
            </div>
        </fieldset>
@@ -61,4 +67,4 @@
        </div>
    </div>
  
</div>
</div>