Merge branch 'master' into debian
[snf-cloudcms] / devflow.conf
2013-02-08 Kostas PapadimitriouDevflow integration