[MERGE] Sync with 7.0
authorThibault Delavallée <tde@openerp.com>
Tue, 15 Jan 2013 11:27:53 +0000 (12:27 +0100)
committerThibault Delavallée <tde@openerp.com>
Tue, 15 Jan 2013 11:27:53 +0000 (12:27 +0100)
commit43368e1159b68968af53946ec6b057f1d86ed2f6
tree4d5eac80a01e37fc594f678f935a981d077b5343
parent89ba4995565dc6cf29139f6248c0c9cfce4996db
parentaebb235afab51da8f315cb53af8987407f3ddafd
[MERGE] Sync with 7.0

bzr revid: tde@openerp.com-20130115112753-p7ams94qeayg0her
addons/mail/res_users.py