Merge branch 'master' of /home/git/repositories/florian030/ispconfig3

Marius Cramer

2013-12-18 5a234a89193bcaaf5b3f7dc1a99bb6c1b10c9df3

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 ;