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

Marius Cramer

2014-10-31 c28bb43232ab64cd17fc359fc482fc274974822f

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