merge upstream
authorChristophe Simonis <chs@odoo.com>
Thu, 19 Jun 2014 11:13:27 +0000 (13:13 +0200)
committerChristophe Simonis <chs@odoo.com>
Thu, 19 Jun 2014 11:13:27 +0000 (13:13 +0200)
commit5206eb16d5a8faeeba152460de05f42721fce245
tree1cfa62cfbf39d96994d4e83eca3e4f5ec60dad7b
parent54605acc65d00de119e01b1a5a48cd97057f019f
parent6a4047f47bc3a998ba9b9601557616b0e30be3f0
merge upstream
addons/website_sale/views/templates.xml
openerp/addons/base/ir/ir_qweb.py