[MERGE] lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam-hr-demo-tpa
authorJigar Amin - OpenERP <jam@tinyerp.com>
Wed, 27 Jun 2012 06:46:17 +0000 (12:16 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Wed, 27 Jun 2012 06:46:17 +0000 (12:16 +0530)
commitebcd793a121d72f57ab2bc7fb78fadc9adcfca1a
tree2a8b6f406a825bb0dba0974d10676670fb6264cd
parentb8a5dc28d0d8a2844a9e6b53126176c6be8cfbe0
parent6ca3ad145fdadf96802b2fb37b18bbff28f4277a
[MERGE] lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam-hr-demo-tpa

bzr revid: jam@tinyerp.com-20120627064617-ygouf9cr8ldtldn1
addons/mail/res_users.py