Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 31 Aug 2012 16:06:36 +0000 (18:06 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 31 Aug 2012 16:06:36 +0000 (18:06 +0200)

Trivial merge