Merge branch 'master' into 'master'

Marius Cramer

2015-04-27 13a336cf2c48089c3235a878e299c5244cc48aa9

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

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