Merge branch 'stable-3.0.5' into 'stable-3.0.5'

Marius Cramer

2015-06-03 3f19613b5ebca832e8f341980278df5f8427c1ca

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