Merge branch 'master' of ssh://git.onelab.eu/git/nodeconfig
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 20 Jul 2015 15:48:34 +0000 (17:48 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 20 Jul 2015 15:48:34 +0000 (17:48 +0200)

Trivial merge