Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 21 Oct 2011 06:49:54 +0000 (08:49 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 21 Oct 2011 06:49:54 +0000 (08:49 +0200)
commitf1fcfbd0c240b33ecec5f2c51364af57a4fcca21
treedf17c35fc0c6f5ea6716fc06c0124534a7ee0178
parent16dc0989ba661a7f75b45c96e5256af9aec580ff
parent29ea3fd11932fca7059b34ba24521d72eaa0a6b6
Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2