Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Till Brehm

2014-05-30 ba8b73bd762032d724f84c5ef94968a7b3af6bec

 interface/web/sites/templates/ftp_user_advanced_client.htm

@@ -9,6 +9,10 @@
                <label for="dir">{tmpl_var name='dir_txt'}</label>
                <input name="dir" id="dir" value="{tmpl_var name='dir'}" size="30" maxlength="255" type="text" class="textInput" />
            </div>
            <div class="ctrlHolder">
                <label for="expires">{tmpl_var name='expires_txt'}</label>
                {tmpl_var name='expires'}
            </div>
        </fieldset>

        <input type="hidden" name="id" value="{tmpl_var name='id'}">