Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 12 Dec 2011 13:29:37 +0000 (14:29 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 12 Dec 2011 13:29:37 +0000 (14:29 +0100)
commit6d642a325266e2e1508c0c7b0317dd510ba71b81
treeb4fd57e31b523b7db4575bd60e933a9971b19dcc
parentd345c5c6d524ebf878bd12afb01bfe964af21630
parentbdc5ded08f34f3246cf4c11febb9d63f42050267
Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2