Merge branch 'erp5'
authorRafael Monnerat <rafael@nexedi.com>
Fri, 15 Jul 2011 05:39:38 +0000 (02:39 -0300)
committerRafael Monnerat <rafael@nexedi.com>
Fri, 15 Jul 2011 05:39:38 +0000 (02:39 -0300)
commit39f297839d06a056ab6149724bab06659fc1c80a
tree0c4dfb7b3f1408c0c561876c5766c27b7299ed92
parentf7fdb589e88a0fb5a6d0e300c6002e253f418981
parent04a17a6958a83a211691a75574cc55173c61ecac
Merge branch 'erp5'

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