From: Andy Bavier <acb@cs.princeton.edu>
Date: Fri, 17 Jun 2011 19:10:17 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
X-Git-Tag: sfa-1.0-26^0
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=112b8f39e16a227ce96186f8fe29bf67b8c5ea8e;p=sfa.git

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

112b8f39e16a227ce96186f8fe29bf67b8c5ea8e