Merge branch 'ftp-autoexpire' into 'master'

Marius Cramer

2014-05-12 1d258eef7ce12c81cf4707ea62b4d2f1ae7b1a91

1
2
3
 
-- increase column size
ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL;