Merge branch 'ftp-autoexpire' into 'master'

Marius Cramer

2014-05-12 1d258eef7ce12c81cf4707ea62b4d2f1ae7b1a91

1
ALTER TABLE `web_domain` ADD `document_root_www` VARCHAR( 255 ) NULL AFTER `document_root`;