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

Marius Cramer

2014-01-07 c1ff9051ff6671895c33972342b0e71c2faee9b9

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