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

Marius Cramer

2014-01-02 0d11ae2055fe36d390e55065fa846c848a04ad07

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