[MERGE] merge with latest trunk
authorAmit Bhavsar (Open ERP) <amb@tinyerp.com>
Tue, 28 May 2013 05:53:48 +0000 (11:23 +0530)
committerAmit Bhavsar (Open ERP) <amb@tinyerp.com>
Tue, 28 May 2013 05:53:48 +0000 (11:23 +0530)
commitfac4be54cc22c384e8068f506c55a69a663e8ae4
tree1fecc4fdf0a3951164a1317245babb7e9ee22992
parent4a7f0f8f88fe16f316aa2c75914ffda436ef8c51
parent6a3ace331d93610ed0d93e45be6994ca6267fe69
[MERGE] merge with latest trunk

bzr revid: bde@tinyerp.com-20130522062609-f54wu6sxrx073mmi
bzr revid: amb@tinyerp.com-20130528055348-femt39yydzg5573i
openerp/addons/base/res/res_partner.py