[MERGE] lp:~openerp-commiter/openobject-addons/trunk-mail-alias-jam-config-aja