Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 28 Nov 2011 13:13:09 +0000 (14:13 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 28 Nov 2011 13:13:09 +0000 (14:13 +0100)
commit8bcc7333f98a9bd37c38649aa66ea78bc880f1c4
tree73a4e20632e5caae18576d614feb7132d10d0539
parentc691fe2f6cf2924fdbaf90976c775afcbb02a773
parentb147f4f8a41124cd00f54955a2ca160a35a3e700
Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2