[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Sat, 24 Sep 2011 14:52:58 +0000 (16:52 +0200)
committerAntony Lesuisse <al@openerp.com>
Sat, 24 Sep 2011 14:52:58 +0000 (16:52 +0200)
commit7a88d9058d8e61d01bebc359609d3bfebdba11a0
tree40e56db35e0ceb928cf783b64d2c98152e202695
parentd743353e1681b8400cca3e02d3964117eeb16ab5
parentdfccbaf28b77fef5860b9ad60ffdf97f3b4a64e0
[MERGE] trunk

bzr revid: al@openerp.com-20110924145258-16r9qi7hr3dip1jz
openerp-server
openerp/addons/base/__openerp__.py
openerp/modules/loading.py
openerp/modules/registry.py
openerp/report/interface.py
openerp/tools/config.py
openerp/workflow/wkf_service.py