Merge branch 'geni-v2' and master
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 3 Sep 2012 12:12:27 +0000 (14:12 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 3 Sep 2012 12:12:27 +0000 (14:12 +0200)
commit7b231b5c74cd6438336f960bf1eb49bad72c9060
tree6a694c8246e9e5ecd62fe755ec7ee39b37ecfa5e
parentec3b659f8709a1538a093a48823895f48a6d2cdb
parent1d4d898c4d42397f6df1ab751af9481b3f8f836e
Merge branch 'geni-v2' and master