Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 21 Jun 2012 14:44:52 +0000 (16:44 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 21 Jun 2012 14:44:52 +0000 (16:44 +0200)
commitcedf37c8661ec0b05349274962bf2db9cfa6a24d
tree22d9f89cce9ff8a6a1eff586d976363abd8f306e
parent351b4cb4acbb8a0bd560b1feb249336cd7fa3dec
parent6e46a2373bcda1c1793d18936cc40fb39beb149a
Merge branch 'master' into senslab2

Conflicts:
setup.py
setup.py
sfa/client/sfi.py
sfa/planetlab/plslices.py
sfa/util/xrn.py