Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Dominik

2015-01-29 4452e73b4867aa7fd49d5066937ebcc0bc84b3d6

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