Merge branch 'erp5-generic' into wprtubackup
authorAntoine Catton <acatton@tiolive.com>
Fri, 6 Jan 2012 10:56:36 +0000 (11:56 +0100)
committerAntoine Catton <acatton@tiolive.com>
Fri, 6 Jan 2012 10:56:36 +0000 (11:56 +0100)
commitce7cea6fdc5c4b2311e78a91f5ecd51947130bc9
tree2b10f00df15998b4119875042c7b8df2ac8e5215
parentb68805a8c1fec3ae032ae48cc8d959615dec524e
parent2f23e0c8c39bddf7c03a9f4afcf7cf08b729361a
Merge branch 'erp5-generic' into wprtubackup

Conflicts:
setup.py
slapos/recipe/librecipe/genericslap.py
slapos/recipe/publish.py
slapos/recipe/request.py
slapos/recipe/softwaretype.py
setup.py
slapos/recipe/librecipe/genericslap.py
slapos/recipe/publish.py
slapos/recipe/request.py
slapos/recipe/softwaretype.py