Merge branch 'upstreammaster' into senslab2
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 24 Jan 2013 22:08:51 +0000 (23:08 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 24 Jan 2013 22:08:51 +0000 (23:08 +0100)
commit5f5f29e2bc00befe5b7b601806ef5a7e44349b75
treeae1aa9923258868f278957e715f801637b7a2b0c
parentd550a4bd30a06f830f8f60a4065ef2097118e09b
parent0b3477f4871a6b47b8a3b99666ffdf5fa53dfa97
Merge branch 'upstreammaster' into senslab2
setup.py
sfa/client/sfi.py
sfa/managers/registry_manager.py