Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 14 Nov 2011 10:51:40 +0000 (11:51 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 14 Nov 2011 10:51:40 +0000 (11:51 +0100)
commit14ca7e52f6af8accc0ba6e362e2a674ea4579e7f
treeda2e8f5aff8189b53d4487abb2232bc027c83183
parent1ad00fe3faa1b0d00d79ba0a5ab56b10ff01efe8
parent36135942ed4dd09cbae187005eb94d70c60f3164
Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2

Conflicts:
sfa/managers/registry_manager_slab.py
sfa/managers/registry_manager_slab.py