[MERGE] Merged with server/trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 14 Aug 2012 08:48:01 +0000 (10:48 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 14 Aug 2012 08:48:01 +0000 (10:48 +0200)
commited9193d4b2e251af993d1468626bc0d8c8c127cd
tree02e20b04ff137b0bd2e4fb978d40888c068175b3
parentf7d274850e9ff73f5ef3e572935c341a3b435a0f
parent3e251640d23035a0c82af3e6c2bbd3eb765df960
[MERGE] Merged with server/trunk.

bzr revid: tde@openerp.com-20120814084801-b01f3uy5o49m2dva
openerp/addons/base/__openerp__.py
openerp/addons/base/base_data.xml
openerp/addons/base/res/res_partner_view.xml