Added by Kostas Papadimitriou almost 10 years ago
Merge branch 'release-0.15'
Conflicts: cloudcms/static/cloudcms/js/common.js cloudcms/synnefo_settings.py version