[MERGE] forward port of branch 7.0 up to be7c894
authorDenis Ledoux <dle@odoo.com>
Tue, 4 Nov 2014 16:54:48 +0000 (17:54 +0100)
committerDenis Ledoux <dle@odoo.com>
Tue, 4 Nov 2014 16:54:48 +0000 (17:54 +0100)
commitf7a76cbb17093784b4e4fc8fdb449819133b18a6
treedb7383c95ca9481098f3cc4db48998ff4a85f531
parent8c4a7cb37143285da0a1a25d0d5e720c45e4346a
parentbe7c894cfd4940004f694ed66beefd45f8e98c0f
[MERGE] forward port of branch 7.0 up to be7c894
addons/mail/mail_mail.py
addons/web/static/src/js/views.js
addons/web_kanban/static/src/js/kanban.js
openerp/addons/base/ir/ir_mail_server.py