[merge] lp:openobject-server/7.0
authorJigar Amin (OpenERP) <jam@tinyerp.com>
Tue, 11 Jun 2013 05:14:58 +0000 (10:44 +0530)
committerJigar Amin (OpenERP) <jam@tinyerp.com>
Tue, 11 Jun 2013 05:14:58 +0000 (10:44 +0530)
bzr revid: jam@tinyerp.com-20130611051458-r4bg46apl7j6kfrf

1  2 
openerp/addons/base/res/res_partner.py
openerp/addons/base/res/res_users.py

Simple merge