From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Thu, 24 Oct 2013 13:58:49 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: geni-v2-broken-and-discontinued~26
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=555b3944cdf4e793b754b5930441e0ca7d1919cb

Merge branch 'master' of ssh://git.onelab.eu/git/sfa
---

555b3944cdf4e793b754b5930441e0ca7d1919cb