Merge branch 'stable-3.1'

Marius Burkard

2016-02-24 5e82da8cacb670f329102b8d15b982ac1960e62f

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