Merge branch 'master' into kvm
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 13 Feb 2012 12:04:16 +0000 (13:04 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 13 Feb 2012 12:04:16 +0000 (13:04 +0100)
commit60b4863703a040f462fc8b1d8ef4995247404a74
tree47ff335890b8d47b0454dbbb0fdb1ec9ab884707
parentcfc2b8bbfcd9f5c2463f84978d68f0e3f2640f91
parent611f80e01bfd8556f96fac86846f01eb9cf71259
Merge branch 'master' into kvm

Conflicts:
slapos/recipe/request.py
setup.py