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

Marius Cramer

2014-03-06 82b723df86594a89fb53607981488319e39b1b92

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