Merge branch 'master' into 'master'

Marius Cramer

2015-01-08 513a1785121fe98ced58bb0713885926a1ee42a9

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