From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Mon, 11 Oct 2010 20:38:22 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/nodemanager
X-Git-Tag: nodemanager-2.0-21~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=59852e464a1a5d2c9758e36059d21b5306d9215e;p=nodemanager.git

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

59852e464a1a5d2c9758e36059d21b5306d9215e