Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 5 Feb 2013 21:20:22 +0000 (22:20 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 5 Feb 2013 21:20:22 +0000 (22:20 +0100)
commit97ed8f665084a5ed4952ca7458dda4b5664ed6af
tree83f9f5dccb447606d1e3c22a3341c1c9a1c714b2
parent591393c7ff7401d065be03d0995b91e23221cf1b
parent7d019f10c35a735bd8bb04e63f00f6dd204e960a
Merge branch 'erp5-component' into erp5

Conflicts:
component/rpm2cpio/buildout.cfg