Merge branch 'master' into 'master'

Marius Cramer

2015-09-18 5cc181a90f7d27f4ec578a8a892b4dd0ca44adf4

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