[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)
commitd334814bf5c77063f1a36c985b5c7d6f0bdce655
tree03827cf186a8461aacfc92e800ce83809680d285
parent6d4215c9bf52b635fecab5c18baffa210f9694be
parente403f2cbde99d31d8341972426da546649fe932b
[merge] lp:openobject-server/7.0

bzr revid: jam@tinyerp.com-20130611051458-r4bg46apl7j6kfrf
openerp/addons/base/res/res_partner.py
openerp/addons/base/res/res_users.py