Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel
authorXavi Leon <xleon@ac.upc.edu>
Tue, 6 Dec 2011 17:26:34 +0000 (12:26 -0500)
committerXavi Leon <xleon@ac.upc.edu>
Tue, 6 Dec 2011 17:26:34 +0000 (12:26 -0500)
commitc33266491f90ab85c17ace79d5814d21f1528e7c
tree584e1cbd9b507fb8a88413822accf12f6b591bb7
parent6aa8ca091b8a18f75d9256662a8df9b9875066d0
parentda256268978e70f27e39f26012abd615e26a99c4
Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel