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

Marius Cramer

2013-11-25 5b5f7c5ea79c0c9efcb4ecae4bdf1224e8486833

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