From: Kostas Papadimitriou <kpap@grnet.gr>
Date: Tue, 1 Apr 2014 10:05:03 +0000 (+0300)
Subject: Merge branch 'release-0.15'
X-Git-Tag: 0.15~1
X-Git-Url: https://code.grnet.gr/git/snf-cloudcms/commitdiff_plain/46771ad3bc715638c14189a2ecbe4dc3ac0b2e79

Merge branch 'release-0.15'

Conflicts:
	cloudcms/static/cloudcms/js/common.js
	cloudcms/synnefo_settings.py
	version
---

46771ad3bc715638c14189a2ecbe4dc3ac0b2e79