Merge branch 'master' into 'master'

Marius Cramer

2015-06-07 fc0edb2f00bcdc6baaaa29f9041e82f3003b9b44

 interface/web/sites/templates/ftp_user_advanced_client.htm

@@ -10,7 +10,7 @@
                <div class="col-sm-9"><input type="text" name="dir" id="dir" value="{tmpl_var name='dir'}" class="form-control" /></div></div>
            <div class="form-group">
                <label for="expires" class="col-sm-3 control-label">{tmpl_var name='expires_txt'}</label>
                {tmpl_var name='expires'}
                <div class="col-sm-9">{tmpl_var name='expires'}</div>
            </div>