From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 21 Mar 2011 22:07:14 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
X-Git-Tag: nodemanager-2.0-31~1
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=47a2f121f043f7545d68457c21bd995602d3c4b9

Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
---

47a2f121f043f7545d68457c21bd995602d3c4b9