Merge branch 'lxc_devel' of ssh://git.onelab.eu/git/bootmanager into lxc_devel
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 15 Feb 2013 08:07:11 +0000 (09:07 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 15 Feb 2013 08:07:11 +0000 (09:07 +0100)
commitd21256a2684f07a9eee649389a394077486a186f
tree74e48059e108881ecd83aae8f5c0dafb2647f706
parent4c7ed26bca69e388d0fb9bf6b84cf03709d922d3
parente0b35c639e1055c04488f7247c549a09f3dbdad2
Merge branch 'lxc_devel' of ssh://git.onelab.eu/git/bootmanager into lxc_devel