Missed conflict resolved from merge

Marius Cramer

2014-02-18 030bb96e51a32a7c425bdb29db9716bfbe458922

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