Merge branch 'master' into newinterface
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 17 Apr 2012 09:44:56 +0000 (11:44 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 17 Apr 2012 09:44:56 +0000 (11:44 +0200)
commit5d0cf6fd52810f390022fe7183bc2f1d4ca7a3fb
treedd042f1eaf603b844446f7cbae8607ebb8dd9f4e
parentf1b4415be5ba4be9941d25b531c46696b377fa3a
parentc54dbb603564a4bc5192373b18be9255b31a7ae6
Merge branch 'master' into newinterface