Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 16 Nov 2011 14:44:58 +0000 (15:44 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 16 Nov 2011 14:44:58 +0000 (15:44 +0100)
commit4fb70becb406d616257ffadf8bf9093490f71bfc
tree25a78c12ce7212c4636d9155f9746aab5240a299
parentb929347f499490c3bc6317756c897ac502c5ea2b
parente2adde340d3c1678329d69faa511d5a72fb31ccc
Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
sfa/senslab/slab-import.py