[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)
commit19d2466b0f367ca3e889a185f56936ce9f3732c0
tree01940e2d0cb32c25363ced63d65bc388dada3119
parentd75405572fa1c21cccd5ac12826209848c3acbeb
parent104451bd56ee33d2a330afd4fc8f6801fae5d5bd
[MERGE]sync with trunk.

bzr revid: dka@tinyerp.com-20140417102052-b84zv8e1m32jo19j
openerp/addons/base/res/res_partner.py