Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 13 Jul 2012 11:21:37 +0000 (13:21 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 13 Jul 2012 11:21:37 +0000 (13:21 +0200)
commitdd07ad19e9c39e121c6ff177a863c9e7da1f1eac
tree6a26fe300a3abb0287f31d9da12b7eab12f41608
parent471a43bd044e721a4cf1785a8e198f781452adfd
parentd8d584c3122c72a43422493b7c573e2d4b9d3e5e
Merge branch 'master' into senslab2