[MERGE] lp:~openerp-commiter/openobject-addons/trunk-mail-alias-jam-config-aja
authorJigar Amin - OpenERP <jam@tinyerp.com>
Thu, 21 Jun 2012 13:06:03 +0000 (18:36 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Thu, 21 Jun 2012 13:06:03 +0000 (18:36 +0530)
commit9cfcae2a4dd3ae155e4a139296c2529f632fd356
tree882d238ee36ca5258f6a84472f774757bd7836a5
parent2ee394a5e3c62c4a2722662d0a2941c62dff5240
parent9cc7d77b08047ff988a00b4d599afca3aae4bdf8
[MERGE] lp:~openerp-commiter/openobject-addons/trunk-mail-alias-jam-config-aja

bzr revid: jam@tinyerp.com-20120621130603-ltsxhnm1lpz6rozl
addons/mail/__openerp__.py
addons/mail/wizard/update_mail_alias_wizard.xml