Added by John Giannelos almost 13 years ago
Merge branch 'master' of bitbucket.org:nemo32/snf-occi
Conflicts: snf-occi-server.py