[MERGE] res.users.email is really res.users.user_email.
authorVo Minh Thu <vmt@openerp.com>
Wed, 4 Jan 2012 12:49:52 +0000 (13:49 +0100)
committerVo Minh Thu <vmt@openerp.com>
Wed, 4 Jan 2012 12:49:52 +0000 (13:49 +0100)
bzr revid: vmt@openerp.com-20120104124952-nedgq9h2jg132b18


Trivial merge