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 14:22:46 +0000 (15:22 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 15 Nov 2011 14:22:46 +0000 (15:22 +0100)
commit71ac4396f80d826e2a5422ab710a3db868a5692f
tree151e7adc21b1f796ea8c50894f53361843cc11e7
parent3d03c4fc715d590f059a56966a13943803c8c079
parent84e19747c387c2cf2e71ce032d0c61bb682d591d
Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2