Merge branch 'senslab2' of ssh://138.96.116.40/git/sfa into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 19 Oct 2012 12:10:27 +0000 (14:10 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 19 Oct 2012 12:10:27 +0000 (14:10 +0200)
commit980ea53e093afd731ac58b829347b3bc165ad6f3
tree54813263718ed82fd006904c95274d82ba30cec6
parent65575b0ffbc66a28af2ff3fa76e6050367d6b3b9
parentf0991937bc0af0f4fbdc72c71f972ab44ab1aac6
Merge branch 'senslab2' of ssh://138.96.116.40/git/sfa into senslab2

Conflicts:
sfa/senslab/slabslices.py
sfa/senslab/slabslices.py