Merge branch 'master' into 'master'

Marius Cramer

2015-10-23 3ff9d214bf9f34c1ffc5f40227119eb44693363d

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