[merge]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Wed, 25 Jan 2012 13:14:53 +0000 (14:14 +0100)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Wed, 25 Jan 2012 13:14:53 +0000 (14:14 +0100)
bzr revid: nicolas.vanhoren@openerp.com-20120125131453-sblhwsshiahe4qsw

1  2 
addons/web/static/src/js/views.js

Simple merge