Merge branch 'master' of bitbucket.org:nemo32/snf-occi
authorJohn Giannelos <johngiannelos@gmail.com>
Fri, 20 Apr 2012 13:17:24 +0000 (16:17 +0300)
committerJohn Giannelos <johngiannelos@gmail.com>
Fri, 20 Apr 2012 13:17:24 +0000 (16:17 +0300)
commit80578d96574d2467b41e592937ae901ac892c4b6
tree4bf315e0edfe88263dd7207d0b55d6c8c0b5ca75
parentd0ea08cc6ac4e507e2265bdbf97fb4b248a17aa5
parent592e811729d5f061377c854f645311e560ec4faa
Merge branch 'master' of bitbucket.org:nemo32/snf-occi

Conflicts:
snf-occi-server.py
snf-occi-server.py