Merge branch 'patch-1' into 'stable-3.1'

Marius Burkard

2016-03-14 65c80f1a80caed31a3e9322a90b13577fe87496e

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