Merge branch 'senslab2'
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 29 Jan 2013 16:28:51 +0000 (17:28 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 29 Jan 2013 16:28:51 +0000 (17:28 +0100)
commit8f8c136cf823125029bf154a2423087f7cadbcd1
treeef5fd49509cf6d75144f9b6e4e0bab1a502f2ed7
parenta49c0e1ae9001aa0ff22cc7262e5669db0739df5
parent7a5bf8859baaa64e45c55405633f114858d921ff
Merge branch 'senslab2'