Merge branch 'master' into kvm
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 13 Aug 2012 15:18:37 +0000 (17:18 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 13 Aug 2012 15:18:37 +0000 (17:18 +0200)
commit061a7d05987a67c121572db52fcc0fdb9871078a
tree8d3c7ce5feeba18483ec9e675405298a6c94f896
parent875f8a7af8677b1e721e0a956d5fd679cf20bf37
parentd1f1d6a9a79a356ef8f68ae03e498a9cec505d6f
Merge branch 'master' into kvm
slapos/recipe/slaprunner/__init__.py