Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorNicolas Turro <Nicolas.Turro@inria.fr>
Wed, 26 Oct 2011 09:29:39 +0000 (11:29 +0200)
committerNicolas Turro <Nicolas.Turro@inria.fr>
Wed, 26 Oct 2011 09:29:39 +0000 (11:29 +0200)
commit1b51455d89c8e195a05349a9e51d88e327298f41
treee4f4484e7843fc83832444398b0ac17df8d0e9f1
parentd6cd753063fcd03032e14d3ad85671b86099a50d
parentd7a85e4e340b896f4556a653f1ce66ad4395d3ae
Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2