Merge branch 'es_traslation' into 'stable-3.1'

Marius Burkard

2016-04-01 224dde7ac5f03d82b5cb202e1eeba88f0bff96c2

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