[merge]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Tue, 8 May 2012 08:23:01 +0000 (10:23 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Tue, 8 May 2012 08:23:01 +0000 (10:23 +0200)
commit54085d821f145cc919eda743659f33710af83bb0
treed3a348f395d5bb748becc4bcc9b7301d5650d29a
parent7eb29a47870e7fb62f97cffb3d361eba03e58801
parent8b4fce2e7101a005a6e7bc2c978675df2eee4c5b
[merge]

bzr revid: nicolas.vanhoren@openerp.com-20120508082301-kv2apldtvn1sb5zo
addons/web/static/src/xml/base.xml