Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 29 May 2012 09:18:37 +0000 (11:18 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 29 May 2012 09:18:37 +0000 (11:18 +0200)
commitd4fdf5099eff793459ad956b6a40ff85003cecc0
tree51ecf3627b19d7bdd68232e8631ac194d3f2d32a
parent16030c42f1bc92fa646dbca4cb7aff975f0e3cd1
parent2ac2da4b770f57bede8e9a9ee65142242fdf05a3
Merge branch 'master' into senslab2

Conflicts:
setup.py
setup.py
sfa/client/sfi.py
sfa/managers/driver.py
sfa/planetlab/plslices.py
sfa/trust/auth.py
tests/testXrn.py