[MERGE] forward port of branch saas-3 up to bdc4dd4
authorChristophe Simonis <chs@odoo.com>
Fri, 27 Jun 2014 14:06:37 +0000 (16:06 +0200)
committerChristophe Simonis <chs@odoo.com>
Fri, 27 Jun 2014 14:06:37 +0000 (16:06 +0200)
commita4bc65cdbaf8c26992317d34a99472a012a90735
tree13d5245187e873c21c1dad85af6fda01ad6a1ee0
parentec4f32306d52290c34e6976a52fa6921d584a142
parentbdc4dd4a6581d5addfa3c2d4922b14d06414afb6
[MERGE] forward port of branch saas-3 up to bdc4dd4
addons/web/static/src/js/view_list.js
addons/web/static/src/js/views.js
addons/website/models/ir_http.py
addons/website/views/website_templates.xml
openerp/modules/loading.py
openerp/service/db.py