Merge branch 'es_traslation' into 'stable-3.1'

Marius Burkard

2016-04-01 224dde7ac5f03d82b5cb202e1eeba88f0bff96c2

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