From: smbaker <smbaker@fc8clean.lan>
Date: Thu, 29 Dec 2011 03:40:06 +0000 (-0800)
Subject: Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
X-Git-Tag: sfa-2.0-7~13
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0d88de5aaee6820835f2d9770aab6c7392f14e21;hp=-c;p=sfa.git

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

0d88de5aaee6820835f2d9770aab6c7392f14e21