Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel
authorXavi Leon <xleon@ac.upc.edu>
Wed, 21 Dec 2011 16:54:14 +0000 (11:54 -0500)
committerXavi Leon <xleon@ac.upc.edu>
Wed, 21 Dec 2011 16:54:14 +0000 (11:54 -0500)
commit74c55e000fb9322fbae55f40a9a8de427bde04d7
tree9a3f001ff65494026a9a0a9480473f30958831e3
parentea84ea95d9d3ed8de232e41adf97073905255ee0
parent1161f1a2dc733aa33cfeed35e417ce3969813351
Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel