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

Marius Cramer

2014-05-05 c9d4ef4e593bde5a12d3eaa19b44ea5829866004

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