Merge branch 'master' of git@veekun.com:floof
[zzz-floof.git] / floof / templates / upload_art.mako