Merge remote-tracking branch 'ispc3master/master'

Dominik

2014-01-27 7bc0bcdf33dba22dcae84bd1d3e65898b742a4bc

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