[MERGE] forward port of branch saas-3 up to revid 5112 chs@openerp.com-20140407144238...
authorChristophe Simonis <chs@openerp.com>
Mon, 7 Apr 2014 16:05:48 +0000 (18:05 +0200)
committerChristophe Simonis <chs@openerp.com>
Mon, 7 Apr 2014 16:05:48 +0000 (18:05 +0200)
commit0161666e8b6e91da575a96be005cb5f84c64e9cb
treeb2b24f842b6e80c1af7082794436664074593538
parentcee85a925a9240867f96978346b011eae7c08c6f
parent1e9ed7baf620b4d6eb6d5bed1cf7d4317d9c2c96
[MERGE] forward port of branch saas-3 up to revid 5112 chs@openerp.com-20140407144238-3s38zadkh7yxpdy7

bzr revid: chs@openerp.com-20140407160548-ttuc877kknuycoqw
openerp/addons/base/ir/ir_actions.py
openerp/addons/base/ir/ir_http.py
openerp/addons/base/ir/ir_qweb.py
openerp/addons/base/tests/test_expression.py
openerp/cli/server.py
openerp/http.py
openerp/osv/orm.py
openerp/report/render/rml2pdf/trml2pdf.py
openerp/service/server.py