[MERGE] merge trunk into local branch
authorGery Debongnie <ged@openerp.com>
Thu, 16 Jan 2014 14:44:00 +0000 (15:44 +0100)
committerGery Debongnie <ged@openerp.com>
Thu, 16 Jan 2014 14:44:00 +0000 (15:44 +0100)
commit66c78675dce6f894c79c5478c4030541ec79201f
tree623721b78d000d90de3e03aa3326acd37c73ae5d
parent470d42df759ed313eb2075301101da203a80e93d
parent0e870fc7a7a0359e68fce1a9bc8d9b1a3dd24252
[MERGE] merge trunk into local branch

bzr revid: ged@openerp.com-20140116144400-2t13mcnlsnpsez7p
addons/web/static/src/js/search.js