[MERGE] Merged with trunk server.
authorThibault Delavallée <tde@openerp.com>
Thu, 28 Jun 2012 08:31:31 +0000 (10:31 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 28 Jun 2012 08:31:31 +0000 (10:31 +0200)
commit5f784034c58c50c8ed877902848569a5c90b7464
tree41c985efc87f1c4b4b165888747c7c8e963ec4ea
parent423f4d8adff49523051524879f8506414a3a5b78
parent73edcb97f9cfc222fc07bebeb32359ecd417c723
[MERGE] Merged with trunk server.

bzr revid: tde@openerp.com-20120628083131-8ohyrtubya539mr7
openerp/addons/base/res/res_partner.py