Added by Kostas Papadimitriou almost 12 years ago
Merge branch 'clientsdownloads' into newstyles
Conflicts: cloudcms/content.py