[MERGE] Merge last trunk
authorFabien Meghazi <fme@openerp.com>
Wed, 11 Jan 2012 08:53:37 +0000 (09:53 +0100)
committerFabien Meghazi <fme@openerp.com>
Wed, 11 Jan 2012 08:53:37 +0000 (09:53 +0100)
commitfe4526b2d8017fcd98460697143b3c634e75c061
tree9efc8ce894960ab85eea423e9ac839bb37fc64fa
parent25283f304bc4e8dda595be608723188fb556c729
parent2e1c8cceb99e15a1e02dc746039936a199f152b9
[MERGE] Merge last trunk

bzr revid: fme@openerp.com-20120111085337-u65f0pyr1n60mkaw
addons/web/static/src/js/view_form.js
addons/web/static/src/js/view_list.js