From: Andy Bavier <acb@cs.princeton.edu>
Date: Wed, 24 Oct 2012 20:38:58 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/nodemanager
X-Git-Tag: nodemanager-2.1-12~1
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=723c15893937e6350c620f63073a691e5a447a6a

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

723c15893937e6350c620f63073a691e5a447a6a