Merge branch 'stable-3.0.5' of /home/git/repositories/pixcept/ispconfig3 in...

Marius Cramer

2014-01-22 80b5debe90f839a5bf9813a67041a519d559794a

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