From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 3 Sep 2012 12:12:27 +0000 (+0200)
Subject: Merge branch 'geni-v2' and master
X-Git-Tag: sfa-2.1-14~25
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=7b231b5c74cd6438336f960bf1eb49bad72c9060

Merge branch 'geni-v2' and master
---

7b231b5c74cd6438336f960bf1eb49bad72c9060