merge upstream
authorChristophe Simonis <chs@openerp.com>
Tue, 15 Nov 2011 17:00:45 +0000 (18:00 +0100)
committerChristophe Simonis <chs@openerp.com>
Tue, 15 Nov 2011 17:00:45 +0000 (18:00 +0100)
commit3a068ad3b92c6857d8d4cb757d23fb6848e19a79
treeee1df3931d14cab256dd8fe142791597292fdadb
parentbc9149f5b682e3969e913cf437d8719d01dff6e1
parent4d7a24e814d8c22a0723cbaeeda9af982b4c81da
merge upstream

bzr revid: chs@openerp.com-20111115170045-gkwow6acpskbl9yi
addons/web/static/src/xml/base.xml