From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 14 Nov 2013 07:31:26 +0000 (+0100)
Subject: Merge branch 'geni-v3' into dbsession
X-Git-Tag: sfa-3.1-1~42^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b54e90d0c3868fa5afb89ff784cba0d5d36265ad;hp=b54e90d0c3868fa5afb89ff784cba0d5d36265ad;p=sfa.git

Merge branch 'geni-v3' into dbsession
dbsession at this point is almost in sync with geni-v3, let's integrate tehe rest of the deltas
---