[MERGE]with latest.
authorKunal Chavda (Open ERP) <kch@tinyerp.com>
Tue, 17 Dec 2013 06:50:45 +0000 (12:20 +0530)
committerKunal Chavda (Open ERP) <kch@tinyerp.com>
Tue, 17 Dec 2013 06:50:45 +0000 (12:20 +0530)
bzr revid: kch@tinyerp.com-20131217065045-4gk6sda3rfxp3f88

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

Simple merge