Merge proposals dependent on lp://staging/~greg-hellings/web2py/html-py-fix

lp://staging/~greg-hellings/web2py/html-py-fix has no merge proposals.