From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 10 Sep 2014 15:40:15 +0000 (+0200)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-11~4
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=1ccd723dbd0ea31216600e69e240fce8b255f53e

Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
---

1ccd723dbd0ea31216600e69e240fce8b255f53e