Merge remote-tracking branch 'origin/wprtubackup' into kvm
authorRomain Courteaud <romain@nexedi.com>
Fri, 6 Jan 2012 10:58:19 +0000 (11:58 +0100)
committerRomain Courteaud <romain@nexedi.com>
Fri, 6 Jan 2012 10:58:19 +0000 (11:58 +0100)
commit8da8de5196bdbcdb2f5968a12dacc819bffe5ac7
tree81d8da0d7607b136c62a491549062f1e9f70a65c
parent14eab6390e587ae7895894d935d9b3da881dfb21
parentce7cea6fdc5c4b2311e78a91f5ecd51947130bc9
Merge remote-tracking branch 'origin/wprtubackup' into kvm
setup.py
slapos/recipe/softwaretype.py