From: smbaker <smbaker@fc8clean.lan>
Date: Thu, 4 Aug 2011 23:13:27 +0000 (-0700)
Subject: Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
X-Git-Tag: sfa-1.0-29~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fa08ec086dd7540c0af97193336ed573a61beacb;p=sfa.git

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

fa08ec086dd7540c0af97193336ed573a61beacb