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

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

02e14469949f7c982cceccafabf796fbe914f492