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

Marius Cramer

2014-04-10 363ccfedb96d98cb6f03fd2ca44096dcb24c2c7f

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