Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorNicolas Turro <Nicolas.Turro@inria.fr>
Fri, 18 Nov 2011 16:39:08 +0000 (17:39 +0100)
committerNicolas Turro <Nicolas.Turro@inria.fr>
Fri, 18 Nov 2011 16:39:08 +0000 (17:39 +0100)
commit81ec6a0c9ab0e8907af3a8d59fcb6f941aca400b
tree75821a59f93e6bc0b40a664df4a04ee2d0091565
parent19dff4d49e0bf51857903d759947d0a1b01229a4
parent2d0f0a4195ebfad0b64b674dd27fb68b0f42cace
Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2