Merge branch 'master' into 'master'

Marius Cramer

2014-03-07 bed72531bfb1ca225bb2c009dfbacf8f09fcd128

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