[MERGE] lp:~openerp-commiter/openobject-addons/trunk-mail-alias-jam-crm-aja
authorJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 26 Jun 2012 11:28:35 +0000 (16:58 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 26 Jun 2012 11:28:35 +0000 (16:58 +0530)
bzr revid: jam@tinyerp.com-20120626112835-gdc0jrygfnqm6czi


Trivial merge