Test: Merge branch 'master' into dns-dnssec

A. Täffner

2016-01-27 08791fea529813a60987010b45533bd307990138

1
ALTER TABLE `web_domain` ADD COLUMN `enable_spdy` ENUM('y','n') NULL DEFAULT 'n' AFTER `proxy_directives`;