Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 interface/web/sites/form/database.tform.php

@@ -89,7 +89,10 @@
         'datatype'   => 'VARCHAR',
         'formtype'   => 'SELECT',
         'default'   => 'y',
         'value'      => array('mysql' => 'MySQL')
         'value'      => array(
                           'mongo' => 'MongoDB',
                           'mysql' => 'MySQL'
                        )
      ),
      'database_name' => array (
         'datatype'   => 'VARCHAR',