[MERGE]sync with trunk.
authorDarshan Kalola (OpenERP) <dka@tinyerp.com>
Wed, 9 Apr 2014 08:44:52 +0000 (14:14 +0530)
committerDarshan Kalola (OpenERP) <dka@tinyerp.com>
Wed, 9 Apr 2014 08:44:52 +0000 (14:14 +0530)
bzr revid: dka@tinyerp.com-20140409084452-w1e499j21i3eli9d

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