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

Marius Cramer

2014-03-20 0832c839f8141f9f52ce3328db3da2607a394eae

 install/sql/incremental/upd_0050.sql

New file
@@ -0,0 +1,2 @@
ALTER TABLE `dns_slave` DROP INDEX `origin`;
ALTER TABLE `dns_slave` ADD CONSTRAINT `slave` UNIQUE (`origin`,`server_id`);