Merge branch 'master' into thgeneric
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 3 Nov 2011 15:57:26 +0000 (16:57 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 3 Nov 2011 15:57:26 +0000 (16:57 +0100)
commit561044a25626b0c874f644886539ede0053967fc
treee5b471baa90578c0077cdbca785827580a5d44c0
parent3c558bdf883c5408a477a61e43d1486121d35aae
parent2d24bf28050652d9f96704414387cbc999db1ca1
Merge branch 'master' into thgeneric

Conflicts:
sfa/methods/CreateSliver.py
setup.py
sfa/methods/CreateSliver.py
sfa/plc/aggregate.py