[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Sat, 21 Jul 2012 20:11:23 +0000 (22:11 +0200)
committerAntony Lesuisse <al@openerp.com>
Sat, 21 Jul 2012 20:11:23 +0000 (22:11 +0200)
commit3611d585b3e75b895f52868c75d8b213cc39e831
treef722f19b8c756e2f212a35fb551d1971b3aa4169
parent43fb6b3ee39999fd55a045a961372691b8926e58
parent1f515f7e6fdd18319ccc99380f4cba3b75ee1dd5
[MERGE] trunk

bzr revid: al@openerp.com-20120721201123-3824izt73xvmk9vl
addons/web/static/src/js/corelib.js
addons/web/static/src/js/coresetup.js
addons/web/static/src/js/search.js