Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 29 Oct 2012 08:06:46 +0000 (09:06 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 29 Oct 2012 08:06:46 +0000 (09:06 +0100)
commitbcddcccb27539888e5ff85da4601c3eeadcfcf4f
treecb4313b5494e07bce5a2b63f083e46b9e8c253a0
parentdec60ec32219912f239c1fdb3d18373d5bb8461f
parent6717f88d0c48628d749af8c73939f1ddfcfba5b9
Merge branch 'master' into senslab2
setup.py