From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 5 Jan 2011 16:54:57 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
X-Git-Tag: nodemanager-2.0-26~3
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=c4fb872fa1a42b630062c0de3549e0a4c151ee37

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

c4fb872fa1a42b630062c0de3549e0a4c151ee37