Merge branch 'master' into lxc_devel
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 20 Jun 2012 09:57:55 +0000 (11:57 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 20 Jun 2012 09:57:55 +0000 (11:57 +0200)
commit9810ffaa90bac99bbe7a5b18ae914f649193ef8a
tree792195a8335ccacf7d525a1fc9931c4fc7c60918
parent532018958c875717df938661e5e36d06d2cf5053
parente4f2dc7bb0665952588084e7c8013c0c4841d185
Merge branch 'master' into lxc_devel
setup.py
slivermanager.py