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

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

ca48929768093b728c44c51911516df9fb73c8bb