Merge branch 'master' into senslab2
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 10 Nov 2011 14:40:23 +0000 (15:40 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 10 Nov 2011 14:40:23 +0000 (15:40 +0100)
commit36135942ed4dd09cbae187005eb94d70c60f3164
treedeb7eb97c7753ac1a308d1a9b430db85d6c2b475
parentf4aec9987675e5e2d494e209eeab99d41e2eab00
parent7691d2227f76cac186cb98167ac425bd9b5c0d5e
Merge branch 'master' into senslab2