[MERGE] from trunk
authorChristophe Matthieu <chm@odoo.com>
Tue, 27 May 2014 16:28:40 +0000 (18:28 +0200)
committerChristophe Matthieu <chm@odoo.com>
Tue, 27 May 2014 16:28:40 +0000 (18:28 +0200)
commitabab5c2e94af1d2deb39ad9a2575272dbf4037d5
tree1091e94b16168ec99ba40ad81cacaa15cb63edd5
parentbb669f82c8514699e804247a7387a6e948ed9551
parente16233217c6919b33e6d1135ff07538d839f6a2f
[MERGE] from trunk
addons/website_sale/controllers/main.py
addons/website_sale/static/src/js/website.tour.sale.js
addons/website_sale/views/templates.xml