[MERGE] from trunk
authorXavier Morel <xmo@openerp.com>
Thu, 29 Mar 2012 11:03:00 +0000 (13:03 +0200)
committerXavier Morel <xmo@openerp.com>
Thu, 29 Mar 2012 11:03:00 +0000 (13:03 +0200)
commit1b0c1408343bf39117dfaf61e7b0d7445ad40f8f
treeccd7e7207bf1aa017e0a873a05be44259e632f95
parent6ecd85d82635db1d8e7dd2f562ad9cdcad072d81
parentfb7b21d0024ca52d5ae5b1167b72d40cfcbedaa6
[MERGE] from trunk

bzr revid: xmo@openerp.com-20120329110300-z4l730o4y4swmadx
.bzrignore
addons/web/__openerp__.py
addons/web/static/src/css/base.sass
addons/web/static/src/js/core.js
addons/web/static/src/js/search.js
addons/web/static/src/xml/base.xml