Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 21 Jun 2012 15:26:06 +0000 (17:26 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 21 Jun 2012 15:26:06 +0000 (17:26 +0200)
commit1db1a879ffde8991aa95dd80142d555551655e88
treed308909517cb456ea6573898876c16ebd430dd6b
parentfa77e36e57e78fb3f589818782cbdf327414fee5
parentcedf37c8661ec0b05349274962bf2db9cfa6a24d
Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2