Merge branch 'master' into erp5-component-merge
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 18 Jan 2013 09:24:10 +0000 (10:24 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 18 Jan 2013 09:24:10 +0000 (10:24 +0100)
commita95743efe45ea331413d59cb4e338bd09f94ed88
tree28ef53d332520c1f575e1c89161590d5b93c8f38
parent427065a719166ec979dfff7217031f117135e091
parent600234adcf976b8a235295225da64a1876fc41be
Merge branch 'master' into erp5-component-merge
component/imagemagick/buildout.cfg
setup.py
slapos/recipe/request.py