Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-03-13 7c2179f4b8604da1167b29ffb92041cf16fc4dbc

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