From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 13 Apr 2012 11:29:13 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
X-Git-Tag: nodemanager-2.0-35~1
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=cc5a3f5b82d1dd36d58f705f4f64cb8f3da75de1

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

cc5a3f5b82d1dd36d58f705f4f64cb8f3da75de1