[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Thu, 25 Jul 2013 13:51:18 +0000 (15:51 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 25 Jul 2013 13:51:18 +0000 (15:51 +0200)
commit7f0824e762a455674c9f55551bd1d883409dcbfd
tree9cad716089b20c610939ad3ac262037468c86f3b
parent0810ff005cd4937f33d50d8feb4b5a90547fa5ed
parent4af94efccc38c050099749ce4cb0a9364fb8b2c0
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130725135118-urwxu1ilv1m6ljwh
addons/web/static/src/js/view_list.js
addons/web/static/src/js/views.js