[MERGE]Merge with trunk upto revision no 933.
authorKunal Chavda (OpenERP) <kch@tinyerp.com>
Tue, 6 Sep 2011 13:17:55 +0000 (18:47 +0530)
committerKunal Chavda (OpenERP) <kch@tinyerp.com>
Tue, 6 Sep 2011 13:17:55 +0000 (18:47 +0530)
bzr revid: kch@tinyerp.com-20110906131755-s8xgoyvp0za0lqjk

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

Simple merge