Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Marius Cramer

2015-11-15 e0e69db9d9005fa2d98d0f3c88ef781c45cc0da2

 interface/web/themes/default/templates/tabbed_form.tpl.htm

@@ -13,8 +13,6 @@
        <div class='alert-label'><strong><tmpl_var name="error_txt"></strong></div>
        <div class='alert-content'>
         <ol><tmpl_var name="error"></ol>
         <div>TODO: IP address is empty.</div>
         <div>TODO: Hostname is empty.</div>
        </div>
      </div>
   </tmpl_if>