Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 14 Mar 2012 09:38:27 +0000 (10:38 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 14 Mar 2012 09:38:27 +0000 (10:38 +0100)
commit759321e13f13d3851a902470ad462b39863fa20d
tree638d26f3300d60f06d7d8b186a6f67d15681ba3a
parent81386c70035f6a184696bb5d07e01fb42fb3af0d
parentc900832bcc4f4dddceeac1978d56e5f10e0e2bb5
Merge branch 'master' into senslab2
setup.py