Merge branch 'ftp-autoexpire' into 'master'

Marius Cramer

2014-05-12 1d258eef7ce12c81cf4707ea62b4d2f1ae7b1a91

 interface/web/sites/templates/cron_edit.htm

@@ -50,6 +50,12 @@
                <p class="formHint">{tmpl_var name='command_hint_txt'}</p>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='log_output_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='log'}
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='active_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='active'}