Merge remote-tracking branch 'renky/master_fixes'

Marius Cramer

2014-04-10 7e886ae640ca6b38b332f139427d69ae50cca352

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