updated master, resolved conflicts

A. Täffner · A. Täffner · commit ce6e1ddfd09c · 2016-01-22T19:16:39.000+01:00
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
@@ -212,4 +212,3 @@ ALTER TABLE `dns_soa`
 	ADD COLUMN `dnssec_initialized` ENUM('Y','N') NOT NULL DEFAULT 'N',
 	ADD COLUMN `dnssec_wanted` ENUM('Y','N') NOT NULL DEFAULT 'N',
 	ADD COLUMN `dnssec_info` TEXT NULL;
-
