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

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

ff178cb87e544c6179720dc57fa2d08867cbb845