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

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

f3bc4f2d4fd97df55921baa2b14e697e0325c49d