Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 7 Mar 2012 09:13:54 +0000 (10:13 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 7 Mar 2012 09:13:54 +0000 (10:13 +0100)
commita7f2c200e3337fe74e92562f1aeb9d6f8c1eb63c
tree9213ee8535580d164ff9bc8f84fef1bb77822903
parenta5c00c5bbd90082f705877fb0167d744e6e5ffa2
parent1b114ae60d1d0caba61145877c06aed1a29773ca
Merge branch 'master' into senslab2
sfa/client/sfi.py