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

Marius Cramer

2014-07-01 dbf29d9979fe779e8801685c0132dbee681e15cf

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