Merge remote-tracking branch 'origin/erp5' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 13 Dec 2012 09:19:47 +0000 (10:19 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 13 Dec 2012 09:19:47 +0000 (10:19 +0100)
commit4adacfed78e823c1dc2798c70ba6ab4022f8c064
treecd3972da8fd543ddd3e604ea6eb9efa3a81337ba
parentc9398ebd4b8a65501e41b6382aaefc2374040308
parent1253813af4f89b3dcf62ea96c123d69284649a22
Merge remote-tracking branch 'origin/erp5' into erp5-component

Conflicts:
component/librsvg/buildout.cfg
component/mariadb/buildout.cfg
component/rpm2cpio/buildout.cfg
stack/erp5/buildout.cfg