From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 20 Jul 2015 15:48:34 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/nodeconfig
X-Git-Tag: nodeconfig-5.2-5~1
X-Git-Url: http://git.onelab.eu/?p=nodeconfig.git;a=commitdiff_plain;h=6045c4caf33bf49e06488b9a0a3cb09af26b0e63

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

6045c4caf33bf49e06488b9a0a3cb09af26b0e63