[MERGE] from trunk
authorChristophe Matthieu <chm@openerp.com>
Fri, 29 Mar 2013 14:33:57 +0000 (15:33 +0100)
committerChristophe Matthieu <chm@openerp.com>
Fri, 29 Mar 2013 14:33:57 +0000 (15:33 +0100)
commit40844a064514bfd7ce1d381e0aae3e98f2290913
treeb388fdc44954d95d68a5df41912e4f43be2a596c
parent86ebcc1fdc5380dca7179f78212f1a5c25f0c530
parente7bd5fd40d8c2dea7409f298dc4185c10a2cf79f
[MERGE] from trunk

bzr revid: chm@openerp.com-20130329143357-t9jh49676giyxhwe
openerp/addons/base/res/res_partner.py
openerp/addons/base/res/res_users.py