Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 8 Oct 2012 11:28:08 +0000 (13:28 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 8 Oct 2012 11:28:08 +0000 (13:28 +0200)
commitdbd15819d950b69d0c6ba5527660969d0754ad29
tree6550c31d810e55513956e846cd44df6bc3c57869
parent1e6230dedf1ccee3279e5b5e761f78b527e7c76c
parent7fcb8153bd74ce00f9f0d43c8aa090e0b70e345f
Merge branch 'master' into senslab2

Conflicts:
sfa/client/client_helper.py
sfa/managers/registry_manager.py
setup.py
sfa/client/sfi.py
sfa/managers/driver.py
sfa/managers/registry_manager.py
sfa/planetlab/plslices.py
sfa/rspecs/elements/versions/sfav1Lease.py