From: smbaker <smbaker@fc8clean.lan>
Date: Mon, 21 Nov 2011 22:03:20 +0000 (-0800)
Subject: Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
X-Git-Tag: sfa-2.0-1~8
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=0dc36703e0e611113d310d2b2a8e51210576bcc5

Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
---

0dc36703e0e611113d310d2b2a8e51210576bcc5