Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 16 Dec 2011 13:56:38 +0000 (14:56 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 16 Dec 2011 13:56:38 +0000 (14:56 +0100)
commitb8596ce95578bf77158db2a5dacbaab36bdf6b16
tree36701e0823d4d7c0c9f5b7e1950d3fddc4b1b1fc
parent8727730a6ca0b289d1d67cc887a6459781201e52
parente97e0020b0b054e3a340928538e4a2748ea65efc
Merge branch 'master' into senslab2
sfa/client/sfi.py
sfa/plc/plslices.py