Merge branch 'erp5' into master
authorGabriel Monnerat <gabriel@tiolive.com>
Fri, 1 Feb 2013 04:08:23 +0000 (02:08 -0200)
committerGabriel Monnerat <gabriel@tiolive.com>
Fri, 1 Feb 2013 04:08:23 +0000 (02:08 -0200)
commit504243e92851a58146194d40b77d3bd95bbe8bdd
tree2e20343bd87f1a78139fda05dfe478b9f3f305a5
parent978c690041099a82ce89957305101dfed39b0304
parent61b1dd0a60f093d47bd1d4541842b0db13f65e85
Merge branch 'erp5' into master

Conflicts:
component/rpm2cpio/buildout.cfg