Merge remote-tracking branch 'florian030/master'

Marius Cramer

2014-04-10 58964a90d06f523f991a67bd1068e1f504d1f8a9

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