Merge branch 'feature/missing_translation' into 'master'

Falko Timme

2014-12-17 b8cdf90fdb9b83d7fdc22de4c1d2cc6ceb3401c7

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