Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 10 Sep 2012 08:21:37 +0000 (10:21 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 10 Sep 2012 08:21:37 +0000 (10:21 +0200)

Trivial merge