From: Git User <support@planet-lab.org>
Date: Thu, 23 Aug 2012 19:06:39 +0000 (-0400)
Subject: Merge remote-tracking branch 'local_master/geni-v3' into geni-v3
X-Git-Tag: sfa-3.0-0~136
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c741be56ff37781d21af5f0286191aa19b507ded;p=sfa.git

Merge remote-tracking branch 'local_master/geni-v3' into geni-v3
---

c741be56ff37781d21af5f0286191aa19b507ded