From: Git User <support@planet-lab.org>
Date: Sun, 10 Nov 2013 22:59:07 +0000 (-0500)
Subject: Merge remote-tracking branch 'local_master/geni-v3' into geni-v3
X-Git-Tag: sfa-3.1-1~45
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=a6d9810733f7d21fd43ba519dae5ccfcdc138095

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

a6d9810733f7d21fd43ba519dae5ccfcdc138095