Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 30 Aug 2012 12:23:36 +0000 (14:23 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 30 Aug 2012 12:23:36 +0000 (14:23 +0200)
commit97d09a321eff49c73c09f44a10d1ae0d7767d250
treed1a3c630667fb7739e985c0fd0d55f8503da85e7
parent948ad94acbc4605754e9d46680dc5a42d3bf2f6d
parent3d9943d1e5f993408b618cde29ff31b3585e5cef
Merge branch 'master' into senslab2

Conflicts:
sfa/trust/credential.py
sfa/util/xrn.py
setup.py
sfa/client/sfi.py
sfa/trust/credential.py
sfa/util/xrn.py