From: root <root@devel.pl.sophia.inria.fr>
Date: Fri, 24 Aug 2012 15:28:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/geni-v3' into geni-v3
X-Git-Tag: sfa-3.0-0~134
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7fa748355d1af0ed4de2f8817cd648484e9043f2;p=sfa.git

Merge remote-tracking branch 'origin/geni-v3' into geni-v3
---

7fa748355d1af0ed4de2f8817cd648484e9043f2