From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 3 Apr 2013 13:04:48 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/nodeconfig
X-Git-Tag: nodeconfig-5.2-2~1
X-Git-Url: http://git.onelab.eu/?p=nodeconfig.git;a=commitdiff_plain;h=5f5ba1aa660d901497d2293ddade349426834520

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

5f5ba1aa660d901497d2293ddade349426834520