Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 5 Jul 2012 15:00:08 +0000 (17:00 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 5 Jul 2012 15:00:08 +0000 (17:00 +0200)
commitbc77b3e1ce73d7f748d9cc978472dba246034d74
tree22379b43f3f669d215b6bd8ff6a84c6eefd82dd2
parentf0c48dec05727a84a1e3862827df6bfda4b9b851
parente8b16b96a23e1ab54e780587cc7cc0345a1ddf0e
Merge branch 'master' into senslab2
sfa/client/sfi.py
sfa/planetlab/plslices.py
sfa/util/xrn.py