Merged revisons 3687-3748 from 3.0.5 stable branch.

tbrehm

2013-01-03 10b4c85a7686da07bddb5779f8ceea48acdf412e

 interface/web/admin/form/server_config.tform.php

@@ -413,7 +413,7 @@
         'width' => '40',

         'maxlength' => '255'

      ),



/*

'vhost_rewrite_v6' => array (

'datatype' => 'VARCHAR',

'formtype' => 'CHECKBOX',

@@ -422,7 +422,7 @@
),







*/

      'vhost_conf_dir' => array(

         'datatype' => 'VARCHAR',

         'formtype' => 'TEXT',