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 14:34:27 +0000 (15:34 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 14 Nov 2011 14:34:27 +0000 (15:34 +0100)
commit1896c4d204a0088202cba4300ffdeef640b69121
treea8c6fe69b3ac11cf437e4e1223c73f308e14b95b
parent31aa426c0c2fa73aacd2c7cc42a0456eed8cc70a
parent05de3153eef37432df0e737a5f2c745b7e7cad73
Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2