Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

floria030

2014-02-05 7883fc5763a197838718507f572e44572ac23177

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