Merge branch 'stable-3.1'

Marius Burkard

2016-02-04 0c6ca563001ffeaf12081a26f226bf0cab543b65

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