Merge branch 'master' into senslab2
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 6 Nov 2011 20:15:13 +0000 (21:15 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 6 Nov 2011 20:15:13 +0000 (21:15 +0100)
commita8d895c1315a02001b6bd6f393232fa07aa810ea
tree264cac908395c4c272d918d0e08f0e385defcea5
parentbd3ec5aaae7b09abe45dd4d94c5fba606f81d44c
parente98b602a586412b828057bcebf2b6073697720a5
Merge branch 'master' into senslab2
setup.py