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

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

db5e2034e15c72434fdf67ee40d32b980f971705