Merge branch 'work-3.0.5.4p3' of git.ispconfig.org:pixcept/ispconfig3-mods ...

Till Brehm

2014-08-14 a93bfca5eaaf8884da7d03c675fcc87b842909d9

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