Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-02-10 738c3d47f74d8a117175452aac2cd662b0e3b95b

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