[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Wed, 14 Dec 2011 17:24:34 +0000 (18:24 +0100)
committerAntony Lesuisse <al@openerp.com>
Wed, 14 Dec 2011 17:24:34 +0000 (18:24 +0100)
commitf56166d67d255df65eb261480f951f53843cbb84
tree78822b343106e2c2543362421df11d099eb9b416
parentb53ee6fe2074fbbd7dc6932554631a5b3fbec185
parent1db085976809c6fd9276c80724712967ed2dc99e
[MERGE] trunk

bzr revid: al@openerp.com-20111214172434-d1p2kn0vjvmoowec
addons/web/static/src/js/chrome.js
addons/web/static/src/js/view_form.js
addons/web/static/src/js/views.js