From: Andy Bavier <acb@cs.princeton.edu>
Date: Tue, 20 Aug 2013 17:32:24 +0000 (-0400)
Subject: Merge branch 'planetstack' of ssh://git.planet-lab.org/git/nodemanager into planetstack
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0cfdc97756a7cb9c2df48b22f7e04358c9306104;p=nodemanager.git

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

0cfdc97756a7cb9c2df48b22f7e04358c9306104