Merge branch 'master' into senslab2
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 8 Nov 2011 00:12:32 +0000 (01:12 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 8 Nov 2011 00:12:32 +0000 (01:12 +0100)
commit084ce81754d81170842189890eca60e31589fc28
tree17dbcc0d844e6ce532f464db56542a3141ebcef5
parent2779895bd4df9bbf972eeb5ebe4bd831b511706a
parent68f0f5bf538b2633fceee633be2748aaa3eaa709
Merge branch 'master' into senslab2