Merge remote-tracking branch 'origin/erp5-generic' into kvm
authorRomain Courteaud <romain@nexedi.com>
Fri, 6 Jan 2012 10:31:46 +0000 (11:31 +0100)
committerRomain Courteaud <romain@nexedi.com>
Fri, 6 Jan 2012 10:31:46 +0000 (11:31 +0100)
commit14eab6390e587ae7895894d935d9b3da881dfb21
tree58a4c61cb0a65ba495110413054e89513b157a4e
parent1952cfded3f0d35876b189a052968b583d988964
parent2f23e0c8c39bddf7c03a9f4afcf7cf08b729361a
Merge remote-tracking branch 'origin/erp5-generic' into kvm

Conflicts:
component/git/buildout.cfg
setup.py
slapos/recipe/softwaretype.py