[Merge]: merge with lp:~openerp-dev/openobject-server/emails-framework
[Merge]: merge with lp:~openerp-dev/openobject-server/emails-framework

akretion/openerp-server,akretion/openerp-server,akretion/openerp-server