From: Marco Yuen Date: Wed, 9 Nov 2011 21:11:05 +0000 (-0500) Subject: Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel X-Git-Tag: lxcbuild~4^2~1 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fd63ac8ec5675dd673b1433273c3dfb241704c24;p=nodemanager.git Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel --- fd63ac8ec5675dd673b1433273c3dfb241704c24