Merge branch 'master' into senslab2
authorNicolas Turro <Nicolas.Turro@inria.fr>
Fri, 25 Nov 2011 09:43:36 +0000 (10:43 +0100)
committerNicolas Turro <Nicolas.Turro@inria.fr>
Fri, 25 Nov 2011 09:43:36 +0000 (10:43 +0100)
commitbb57cb30c7cfdddcf8e55fd7084e3cdaf67eaac4
treed8a6a188de5a13b35bd2648733588304b647e334
parent43a30d5e8fe5e5a0b9c70b2ec5232d853355e165
parent904c314440f4f0bd3f5c6c767fd7293f4887815b
Merge branch 'master' into senslab2
setup.py