From: Git User <support@planet-lab.org>
Date: Tue, 5 Jun 2012 16:16:33 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: sfa-2.1-10~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f38626e863c9e78b95d4b4fd11c9d6e2ccd05205;p=sfa.git

Merge remote-tracking branch 'origin/master'
---

f38626e863c9e78b95d4b4fd11c9d6e2ccd05205