From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Sun, 15 May 2011 03:24:17 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/myops
X-Git-Url: http://git.onelab.eu/?p=myops.git;a=commitdiff_plain;h=9e7df8fb920f919ded6484e835dad7d8ab44aa9d

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

9e7df8fb920f919ded6484e835dad7d8ab44aa9d