Merge branch 'erp5' into erp5-librsvg
authorRafael Monnerat <rafael@nexedi.com>
Wed, 2 May 2012 14:48:20 +0000 (11:48 -0300)
committerRafael Monnerat <rafael@nexedi.com>
Wed, 2 May 2012 14:48:20 +0000 (11:48 -0300)
commit7edc0a249df755d88eb0f0c3fed6deca85334501
treefa326a0a9cc266687dcc08b999a8812ff1c78f3e
parent66ea78f0b7c62aa01152c50935130a4a1d5bbcec
parent1b8658f47866e65751cac0632e1f4624e9980124
Merge branch 'erp5' into erp5-librsvg
component/imagemagick/buildout.cfg