[MERGE]sync with trunk.
authorDarshan Kalola (OpenERP) <dka@tinyerp.com>
Thu, 17 Apr 2014 10:20:52 +0000 (15:50 +0530)
committerDarshan Kalola (OpenERP) <dka@tinyerp.com>
Thu, 17 Apr 2014 10:20:52 +0000 (15:50 +0530)
bzr revid: dka@tinyerp.com-20140417102052-b84zv8e1m32jo19j

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