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

Marius Cramer

2014-03-13 7c2179f4b8604da1167b29ffb92041cf16fc4dbc

1
2
ALTER TABLE `dns_slave` DROP INDEX `origin`;
ALTER TABLE `dns_slave` ADD CONSTRAINT `slave` UNIQUE (`origin`,`server_id`);