Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorNicolas Turro <Nicolas.Turro@inria.fr>
Mon, 7 Nov 2011 07:51:38 +0000 (08:51 +0100)
committerNicolas Turro <Nicolas.Turro@inria.fr>
Mon, 7 Nov 2011 07:51:38 +0000 (08:51 +0100)
commit2779895bd4df9bbf972eeb5ebe4bd831b511706a
treef7d753a3592a6765351dbf87821765b7b2ee823b
parent2dda3d0eb61c23ca4640fc02c578ce3ef3956a80
parenta8d895c1315a02001b6bd6f393232fa07aa810ea
Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2