Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 26 Jun 2012 08:45:42 +0000 (10:45 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 26 Jun 2012 08:45:42 +0000 (10:45 +0200)
commite8fc48e051df886018a44560a746db08e564cd73
tree24dfb8739ff0d6def51313b9a1a4b36b388aab90
parenta035dee017ce347a5e554fbbdd4ceed20830f2d0
parent3d20bfc153c33bbc3725d0259221dff703b3a5aa
Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2

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