Merge branch 'master' into 'master'

Marius Cramer

2015-05-07 f6e42fc631acad20006ad79f63ccecc0a86ad0eb

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

@@ -314,6 +314,14 @@
            'width'  => '30',
            'maxlength' => '255'
         ),
         'iptables' => array (
            'datatype' => 'VARCHAR',
            'formtype' => 'TEXT',
            'default' => '',
            'value'  => '',
            'width'  => '30',
            'maxlength' => '255'
         ),
         //#################################
         // ENDE Datatable fields
         //#################################