From: Xavi Leon Date: Tue, 6 Dec 2011 17:26:34 +0000 (-0500) Subject: Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel X-Git-Tag: nodemanager-2.1-1~22 X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=c33266491f90ab85c17ace79d5814d21f1528e7c Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel --- c33266491f90ab85c17ace79d5814d21f1528e7c