Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into ...

Till Brehm

2013-11-25 45547df91d6510edf3a22dc7cb55303eaeaf63bd

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