Merge branch 'master' into senslab2
Thierry Parmentelat [Sun, 6 Nov 2011 20:15:13 +0000 (21:15 +0100)]
1  2 
setup.py

diff --cc setup.py
+++ b/setup.py
@@@ -43,10 -43,8 +43,9 @@@ package_dirs = 
      'sfa/methods',
      'sfa/generic',
      'sfa/managers',
-     'sfa/managers/vini',
      'sfa/importer',
      'sfa/plc',
 +    'sfa/senslab',
      'sfa/rspecs',
      'sfa/rspecs/elements',
      'sfa/rspecs/elements/versions',