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

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

23172150ccd0a5be308b236ee44d2dcc2c409565