Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 28 Mar 2012 09:56:17 +0000 (11:56 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 28 Mar 2012 09:56:17 +0000 (11:56 +0200)
commit7d3140aa22406b54c32e0a830e969cfe4b699828
tree8ba32fbe8ef366717582c58e76b71cb2b3185d78
parent71b1c02f5f5a279aabf9e3d8c77e8caf7eb9d987
parentac832e597753b6be0a819a07dccf86edb76d03c7
Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
sfa/senslab/slabaggregate.py
sfa/senslab/slabdriver.py