merged master onto senslab2, manually solved conflicts in setup.py
[sfa.git] / sfa / senslab / sfa-bare
2011-11-03 Thierry Parmentelatmerged master onto senslab2, manually solved conflicts...
2011-10-27 Sandrine AvakianMerge branch 'senslab2' of ssh://flab-git.pl.sophia...
2011-10-26 Nicolas TurroMerge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa...
2011-10-26 Nicolas TurroAdd an init script that doesn't depend on PLE. NT.