[merge]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Fri, 20 Jan 2012 13:06:59 +0000 (14:06 +0100)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Fri, 20 Jan 2012 13:06:59 +0000 (14:06 +0100)
bzr revid: nicolas.vanhoren@openerp.com-20120120130659-rawyshnhas9yflw1

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

Simple merge