Merge branch 'devel'
[qcg-portal.git] / templates / qcg / gridftp_upload.html