Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 2 Jan 2013 13:03:08 +0000 (14:03 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 2 Jan 2013 13:03:08 +0000 (14:03 +0100)
commita4a9bf9de22e4dd68ec84d388524ba1c15e86d39
treee4fa7b2e3abcb6180d0d5ad03e20876eb78a8204
parent1d1f8709cd81ce67285cf32cd9e2222e6473e6e3
parent667ee8a8989f8bba94827c4e9d3ea86b168a7e92
Merge branch 'master' into senslab2