From: smbaker <smbaker@fc8-storktest.lan>
Date: Tue, 18 Jun 2013 22:07:59 +0000 (-0700)
Subject: Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/nodemanager
X-Git-Tag: nodemanager-5.2-4~14
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=34bbf772786e0e674d2b83ddfb079cb060830ff1

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

34bbf772786e0e674d2b83ddfb079cb060830ff1