[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)
commit1a1a77afef1d85b3bf809e9028088749af35230d
treeb80c1aa7ba5e831c6354a0891e2abb3ef507f198
parent28be7b5e8043a7a7198dd36fd195e009f20da623
parentee0c76d2c5e19864ddc573dd39a6b606d31b244d
[merge]

bzr revid: nicolas.vanhoren@openerp.com-20120120130659-rawyshnhas9yflw1
addons/web/static/src/js/views.js