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

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

3268bba1a642dc9b7aaa8978eb4de2f3c7f410a8