From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 20 Jun 2012 06:34:12 +0000 (+0200)
Subject: Merge branch 'master' into lxc_devel
X-Git-Tag: nodemanager-2.1-2~6
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=0f51f7fc64906f87640def6f27a1dc732ed8f453

Merge branch 'master' into lxc_devel
---

0f51f7fc64906f87640def6f27a1dc732ed8f453