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)
commitd4bf21b9cd5596d72d5c414444a8f3b9708366b5
treea1cb0603019aed4080932fa7f6b8ca42783818b4
parent8d14077fe21d1e78dba172962f9f0d003974ec29
parentd58796f6bdf59cc669ac207daebe03a0ef9dab3b
Merge branch 'master' into senslab2