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

Marius Cramer

2014-04-04 36420c614b259a0ca1aa7db14b1215db60c4c5ce

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