[MERGE] Implementation of mail.alias by Jigar Amin
authorOlivier Dony <odo@openerp.com>
Tue, 3 Jul 2012 16:01:55 +0000 (18:01 +0200)
committerOlivier Dony <odo@openerp.com>
Tue, 3 Jul 2012 16:01:55 +0000 (18:01 +0200)
bzr revid: odo@openerp.com-20120703160155-gw8po01vmm0q30ow


Trivial merge