[MERGE] forward port of branch saas-3 up to c571413
authorDenis Ledoux <dle@odoo.com>
Fri, 14 Nov 2014 17:02:02 +0000 (18:02 +0100)
committerDenis Ledoux <dle@odoo.com>
Fri, 14 Nov 2014 17:02:02 +0000 (18:02 +0100)
1  2 
addons/web/static/src/js/search.js

Simple merge