[MERGE] forward port of branch saas-3 up to 310d3fe
authorChristophe Simonis <chs@odoo.com>
Wed, 30 Jul 2014 17:09:33 +0000 (19:09 +0200)
committerChristophe Simonis <chs@odoo.com>
Wed, 30 Jul 2014 17:09:33 +0000 (19:09 +0200)
commitfa07bc85329d825107f332053cecd2a51771823c
treec1827e81ab0988eed0468f4a0dc20863c5ee48a6
parent7127d2cdc34dd54de5e6931f32bc85d090494b55
parent310d3fe4c44019174a0acd1d325b67daa849e282
[MERGE] forward port of branch saas-3 up to 310d3fe
addons/mail/mail_message.py
addons/project_long_term/project_long_term.py
addons/sale/sale.py
addons/website/controllers/main.py
addons/website/models/ir_http.py
openerp/tools/translate.py