Merge branch 'master' into 'master'

Marius Cramer

2014-10-31 474f4595c7aa07c678dceb90d06dfecf51007dd0

 interface/lib/classes/custom_datasource.inc.php

@@ -139,6 +139,18 @@
      case 'default_vserverserver':
         $field = 'vserver_server';
         break;
      case 'mail_servers':
         $field = 'mail_server';
         break;
      case 'web_servers':
         $field = 'web_server';
         break;
      case 'dns_servers':
         $field = 'dns_server';
         break;
      case 'db_servers':
         $field = 'db_server';
         break;
      default:
         $field = 'web_server';
         break;