From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 23 Sep 2010 10:45:38 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
X-Git-Tag: nodemanager-2.0-19~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6f3c475c348307db846d9b9675cefabf95416856;p=nodemanager.git

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

6f3c475c348307db846d9b9675cefabf95416856