merged master onto senslab2, manually solved conflicts in setup.py
[sfa.git] / sfa / managers / senslab /
2011-11-03 Thierry Parmentelatmerged master onto senslab2, manually solved conflicts...
2011-10-20 Sandrine AvakianMerge branch 'master' into exp2
2011-09-20 vagrantAdded first version of file for Senslab Rspec sl.rng