Merge branch 'mergebranch'

Marius Burkard

2016-01-04 cb287d1f1be13beaba7fe84c906dd0683dfb9fb5

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