[MERGE] Sync with trunk
authorRichard Mathot (OpenERP) <rim@openerp.com>
Mon, 14 Apr 2014 09:11:37 +0000 (11:11 +0200)
committerRichard Mathot (OpenERP) <rim@openerp.com>
Mon, 14 Apr 2014 09:11:37 +0000 (11:11 +0200)
commit96417099b3902d7d297bda9afd3564729be1e328
tree71ecf11856fa9c25d08f638fee7a035140fcd7d6
parentbfaa95a9e059adb8ad6461b5c6cd202d4b354ac7
parentea167ad7ab9408d435baaf033900c58dbd2acfc7
[MERGE] Sync with trunk

bzr revid: ypa@tinyerp.com-20140404114223-zalha5tvp2l0ov8f
bzr revid: rim@openerp.com-20140414091137-icatnn1humn7kisc
openerp/addons/base/res/res_partner.py