Merge branch 'master' into 'master'

Marius Cramer

2015-08-27 7b26eae1b657e81aefe2a50e1c15518f0f6ee935

 interface/web/vm/form/openvz_vm.tform.php

@@ -327,6 +327,12 @@
         //#################################
      )
   );

   $form["tabs"]['additional_ip'] = array (
      'title'  => "Additional IP",
      'width'  => 100,
      'template'  => "templates/openvz_vm_additional_ip_edit.htm",
   );
}