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

florian030

2014-02-18 35a68db64451d951fe35a3bbb22dfaf06a20109c

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 ;