Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 15 Nov 2011 13:27:15 +0000 (14:27 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 15 Nov 2011 13:27:15 +0000 (14:27 +0100)
commit105d3b993e70d0a4fc8232cffdad918048c5ad32
treec4d45633ca07268baec0acf3c5cf7fc4272adff9
parent951d64319c7f96f7f4d6d295040926e1baf4017f
parentda4a0cfcc9bb73eebd807e9514a80eb4ef6c4c57
Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2