From: root <root@devel.pl.sophia.inria.fr>
Date: Mon, 20 Aug 2012 18:49:25 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/geni-v3' into geni-v3
X-Git-Tag: sfa-3.0-0~141
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=459f6baa4386e92b1bf7b71163ee161b26a2d4b5;hp=40c926f42511f68119ca769888d581fc13d8b181;p=sfa.git

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