Merge branch 'master' of /home/git/repositories/florian030/ispconfig3

Marius Cramer

2013-12-27 6b1d788d1d50fd38f68f152285f3fa816a9d7880

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