Merge remote-tracking branch 'origin/master' into kvm
authorRomain Courteaud <romain@nexedi.com>
Wed, 20 Jun 2012 15:04:06 +0000 (17:04 +0200)
committerRomain Courteaud <romain@nexedi.com>
Wed, 20 Jun 2012 15:04:06 +0000 (17:04 +0200)
commit7dfe15ecb32e32b130068eb76b3ee745a6b4f28f
treeb1e79803c73e2f7e6f41b1793d90f2a4571e3505
parent3badc3b30625765bbb8adddbbc0187d0da3a5b00
parentaeffed912fbe70a4fa1eecf316cf8df7473996d4
Merge remote-tracking branch 'origin/master' into kvm

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