[MERGE] trunk
authorFabien Meghazi <fme@openerp.com>
Mon, 17 Dec 2012 11:38:42 +0000 (12:38 +0100)
committerFabien Meghazi <fme@openerp.com>
Mon, 17 Dec 2012 11:38:42 +0000 (12:38 +0100)
commitc1e9e6f12e343244f86fbf56bf4e5eb983b334d5
tree25b700d47006479c71f36c6231a64619d6715574
parenta724c43257252e19a9bb37fca9a01aae0c8bf8f5
parentc8b5413f371fde077c872a9b782b7b60394f5e0d
[MERGE] trunk

bzr revid: fme@openerp.com-20121217113842-j3a013i7xrsb5a69
addons/web/static/src/js/chrome.js
addons/web/static/src/xml/base.xml