From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 31 Aug 2012 16:06:36 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
X-Git-Tag: nodemanager-2.1-9~1
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=fccf8b1e3c357c14d6f3229bd0d5c0c48d65e21a

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

fccf8b1e3c357c14d6f3229bd0d5c0c48d65e21a