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

Florian Schaal

2015-02-18 412fe8897175b054b1b2f5931f428ec2a0a2f91f

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