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

Marius Cramer

2013-11-03 78fc9a64bdd7fc1ac11c8718e097799236c0ba23

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