Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 27 Oct 2011 13:39:20 +0000 (15:39 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 27 Oct 2011 13:39:20 +0000 (15:39 +0200)
commit9b8234d5a13b82e9c480d68883cef7ee14d0fc68
tree4b1c1b5c7f4191422fbaa72ab6609c7a0a26eb42
parent9bd8e71c71ad2065fe5ab9d16266b7f9c7d4d724
parent2436aa99c11ebf80292cd144723472870365d4a7
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