[MERGE] forward porting fixes from saas-3
authorFrédéric van der Essen <fva@openerp.com>
Mon, 10 Feb 2014 15:56:28 +0000 (16:56 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 10 Feb 2014 15:56:28 +0000 (16:56 +0100)
commit04a6074b1a09fdab3922f014c0737480e0ea6138
treef202e4d2dc8a0ef6f3bcd114ef4a159e77c84218
parent90ed82bb14801925b54582b4ac78132a2186685c
parent82277b178bb46504c1c8c793e725642cca9fa188
[MERGE] forward porting fixes from saas-3

bzr revid: fva@openerp.com-20140210155628-75mgw7qcq9k5ncem
addons/website/static/src/js/website.tour.banner.js
addons/website/views/website_templates.xml