Merge branch 'erp5-component' into erp5
authorRafael Monnerat <rafael@nexedi.com>
Wed, 8 Aug 2012 14:24:23 +0000 (16:24 +0200)
committerRafael Monnerat <rafael@nexedi.com>
Wed, 8 Aug 2012 14:24:23 +0000 (16:24 +0200)
commit1dd3404d1bdd44deff60f253296f8a28ebbd19e4
treeeb78dba3182ad52ea019e902f5c911e1463a7493
parentdd5b9f802ab8429a1082dc42eba098c0c8a93da0
parent7b840d307b4b2fda349f57dc725bc9e220c88b6d
Merge branch 'erp5-component' into erp5

Conflicts:
software/erp5/software.cfg
stack/cloudooo.cfg
stack/erp5/buildout.cfg