From: smbaker <smbaker@fc8clean.lan>
Date: Tue, 8 Nov 2011 03:13:19 +0000 (-0800)
Subject: Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
X-Git-Tag: sfa-1.1-3~92
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2159d6c0ef322100fa14a8d038151d42f1b8be39;p=sfa.git

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

2159d6c0ef322100fa14a8d038151d42f1b8be39