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

Florian Schaal

2015-01-14 b3f01831e85a16e60b547e959f5be920ed32a898

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