From: root <root@blitz.inria.fr>
Date: Tue, 5 Apr 2011 23:52:33 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: nodemanager-2.0-32~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=a59241a590ca035a320f06fa7cca0d309af53f5a;p=nodemanager.git

Merge commit 'origin/master'
---

a59241a590ca035a320f06fa7cca0d309af53f5a