Merge branch 'master' into 'master'

Marius Cramer

2015-10-23 831dd0a0f913fced0cb0df645cfe0348170798d0

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