From: Git User <support@planet-lab.org>
Date: Thu, 7 Jun 2012 08:21:32 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: sfa-2.1-11~2^2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=6fb6722b5eaaae2738328b2cb99f92e6d724b471

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

6fb6722b5eaaae2738328b2cb99f92e6d724b471