From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 23 Mar 2011 08:21:40 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
X-Git-Tag: nodemanager-2.0-32~9
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4ad6db02300c72a135d59ce1c86a1416993dc235;p=nodemanager.git

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

4ad6db02300c72a135d59ce1c86a1416993dc235