From: Git User <support@planet-lab.org>
Date: Thu, 14 Nov 2013 13:43:42 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/geni-v2' into geni-v2
X-Git-Tag: geni-v2-broken-and-discontinued~10
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=b091863dec78028fa1d7833984be46ee94d435aa

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

b091863dec78028fa1d7833984be46ee94d435aa