Merge branch 'lxc_devel' of ssh://git.planet-lab.org/git/build into lxc_devel
authorMarco Yuen <marcoy@gmail.com>
Mon, 19 Dec 2011 15:23:35 +0000 (10:23 -0500)
committerMarco Yuen <marcoy@gmail.com>
Mon, 19 Dec 2011 15:23:35 +0000 (10:23 -0500)
commit3600664ea9ed022a373d82e0d0db0cc50b887ad7
tree4090c54fafb6cedc0c62a5712f420704e5a0533b
parent1cd72febb703801a5d4abd11810997d5684409e4
parent02b314bdc3bd6e9ad127a8209dc1f64952955583
Merge branch 'lxc_devel' of ssh://git.planet-lab.org/git/build into lxc_devel
planetlab.mk