[Merge]: Merge with Parent branch
authorYogesh Parekh (OpenERP) <ypa@tinyerp.com>
Mon, 31 Mar 2014 09:48:47 +0000 (15:18 +0530)
committerYogesh Parekh (OpenERP) <ypa@tinyerp.com>
Mon, 31 Mar 2014 09:48:47 +0000 (15:18 +0530)
bzr revid: ypa@tinyerp.com-20140331094847-6pytp2gl19vhk5c8

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