Merge remote-tracking branch 'sebj/master' and tidied up merged code

Marius Cramer

2013-11-18 015dffdc589b396d72092583cc526674f0a9a8d5

 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;