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)
1  2 
sfa/client/sfi.py

Simple merge