Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorNicolas Turro <Nicolas.Turro@inria.fr>
Wed, 28 Mar 2012 14:43:36 +0000 (16:43 +0200)
committerNicolas Turro <Nicolas.Turro@inria.fr>
Wed, 28 Mar 2012 14:43:36 +0000 (16:43 +0200)
commit79a37c7df42d5029ffe1a829d052391f618981f1
tree80947b151a519b4ded2c087fa4b46ceae5af65ac
parentace4a403aeda781941545208b3c961a7bd702fe4
parentb658eccb96b270056ac190f0ef386acb0382d40a
Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2

Conflicts:
sfa/senslab/slabaggregate.py
sfa/senslab/slabaggregate.py
sfa/senslab/slabdriver.py