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

florian030

2014-02-25 cce9d63279d9078dd0292dd015be497600ac5f32

1
2
ALTER TABLE `client` ADD `paypal_email` VARCHAR( 255 ) NULL DEFAULT NULL AFTER `bank_account_swift` ;
ALTER TABLE `web_domain` ADD `proxy_directives` MEDIUMTEXT NULL DEFAULT NULL ;