Merge branch 'erp5'
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 17 Apr 2013 13:11:26 +0000 (15:11 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 17 Apr 2013 13:11:26 +0000 (15:11 +0200)
commit1d2cd8053c415db833c08a779e3474faeaff8347
tree9a4caac27a091a1e52640b343827c690b9972bc0
parent66661b0bfc8b6442b3b0e729ba5f2c40862f4276
parent911b6b1b8f4d2fc51c9ce279994aeac35359badc
Merge branch 'erp5'

Conflicts:
component/curl/buildout.cfg
component/perl-SGML-Parser-OpenSP/buildout.cfg
component/perl/buildout.cfg