[MERGE] Merged with server/trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 4 Sep 2012 07:51:05 +0000 (09:51 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 4 Sep 2012 07:51:05 +0000 (09:51 +0200)
commit1f84036086904b6d2c3c9ab643b50b2fe1210f47
tree6cefd6f0ad973a9ae05e5563d37120a39544ac6e
parent1bcad78c9958b3dee7c63e45a09cdfa3a9ebf64b
parentf9be81cb207aa42f5ca6f23f6f841536cc18590d
[MERGE] Merged with server/trunk.

bzr revid: tde@openerp.com-20120904075105-ljg3lgn6tf958kvd
openerp/addons/base/res/res_partner.py
openerp/tools/misc.py