From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 2 Apr 2014 09:45:45 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
X-Git-Tag: nodemanager-5.2-12~1
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=84936c9dc941fc82cd58be637a2d9344b5d6c3c7

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

84936c9dc941fc82cd58be637a2d9344b5d6c3c7