Merge remote-tracking branch 'origin/wprtubackup' into kvm
authorRomain Courteaud <romain@nexedi.com>
Mon, 9 Jan 2012 17:22:10 +0000 (18:22 +0100)
committerRomain Courteaud <romain@nexedi.com>
Mon, 9 Jan 2012 17:22:10 +0000 (18:22 +0100)
commit2af0d2de41105c1adc1f5c42c3a46c708238f298
treec1d01ab1cb5055ec643efb01c1218ac44a547c05
parentdfd766cfef033de932b1419d1f4ad121178dcd5a
parentd9c14ee51eb1e31c5d255877c2bac88d9d3fb6e4
Merge remote-tracking branch 'origin/wprtubackup' into kvm
slapos/recipe/softwaretype.py