merge upstream
authorChristophe Simonis <chs@openerp.com>
Tue, 22 Nov 2011 12:31:19 +0000 (13:31 +0100)
committerChristophe Simonis <chs@openerp.com>
Tue, 22 Nov 2011 12:31:19 +0000 (13:31 +0100)
commitd1792b9704e0604e3a71a52ea25e9c539eecd707
treee11dc75e5e00708eaf64b21456752b5e535ad471
parent64d223d4271a431457992a399e5cb65795ac4c11
parentbea1a79705a2f343d48187a3fe26e025ebaf93f9
merge upstream

bzr revid: chs@openerp.com-20111122123119-4b8a5piay9kvsuxo
addons/web/static/src/js/chrome.js
addons/web/static/src/js/core.js