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

Merge branch 'master' into lxc_devel
---

9810ffaa90bac99bbe7a5b18ae914f649193ef8a