Merge branch 'erp5'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 14 Dec 2012 10:43:47 +0000 (11:43 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 14 Dec 2012 10:43:47 +0000 (11:43 +0100)
commitf889326a272436adcee6c00a27461ede5d0e1efd
tree3bd0f27241aa0b15ea686a04222161918b83e985
parent6428f26d79313e0c94e45cc720ec4db40d2cd84c
parent1253813af4f89b3dcf62ea96c123d69284649a22
Merge branch 'erp5'

Conflicts related to URL changes:
component/imagemagick/buildout.cfg
component/libtiff/buildout.cfg
component/rpm2cpio/buildout.cfg