Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 2 Apr 2014 09:45:45 +0000 (11:45 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 2 Apr 2014 09:45:45 +0000 (11:45 +0200)

Trivial merge