Merge remote-tracking branch 'ispc3master/master' into vhostalias

Dominik

2014-01-23 2d7d9eaa5acda62f1580bc09304ce85a7f7cea9f

1
ALTER TABLE `client` ADD `default_slave_dnsserver` INT( 11 ) UNSIGNED NOT NULL DEFAULT '1' AFTER `limit_dns_zone`;