Merge branch 'stable-3.1'

Marius Burkard

2016-02-04 eca13b968042fe7c21a5a01daaf1e1dffd3a83c6

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