Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 05beae43cfeb15ea89b984d36105dcdbdffd0975

 interface/lib/classes/custom_datasource.inc.php

@@ -105,6 +105,9 @@
         case 'default_dnsserver':
            $field = 'dns_server';
         break;
         case 'default_slave_dnsserver':
            $field = 'dns_server';
         break;
         case 'default_fileserver':
            $field = 'file_server';
         break;