[MERGE] Latest trunk.
authorvta vta@openerp.com <>
Mon, 15 Oct 2012 08:24:58 +0000 (10:24 +0200)
committervta vta@openerp.com <>
Mon, 15 Oct 2012 08:24:58 +0000 (10:24 +0200)
commit68cf1f2d6acb3fb5274004832b21107b249609b2
tree028eecea49c4e959973c51c99b1da2ea1d43a7af
parent73c32663d6050563eb5fb18a2492a1f1d898d876
parentfca9f19f76b5c24e5388d6d1d84fd47a09e94233
[MERGE] Latest trunk.

bzr revid: vta@openerp.com-20121015082458-rudm5r0718ky7829
addons/web/doc/conf.py
addons/web/static/src/js/view_form.js
addons/web/static/src/js/views.js