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

Dominik

2015-01-29 4452e73b4867aa7fd49d5066937ebcc0bc84b3d6

1
ALTER TABLE `ftp_user` ADD `expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `dl_bandwidth` ;