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

Florian Schaal

2015-01-14 c554c4f383f992b3783749a8401cf367237b2a62

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