From: Xavi Leon Date: Wed, 21 Dec 2011 16:54:14 +0000 (-0500) Subject: Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel X-Git-Tag: nodemanager-2.1-1~16 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=74c55e000fb9322fbae55f40a9a8de427bde04d7;p=nodemanager.git Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel --- 74c55e000fb9322fbae55f40a9a8de427bde04d7