[MERGE] from trunk
authorchm@openerp.com <>
Tue, 18 Mar 2014 10:21:02 +0000 (11:21 +0100)
committerchm@openerp.com <>
Tue, 18 Mar 2014 10:21:02 +0000 (11:21 +0100)
commitabe8e7208ec3390624a02de292791758ed092d08
tree2e2d400e115e2a13dc593b9ed695a3f24e1a98f8
parenteddd7884d0f5def2db1a66e9b09ff675fd8846b6
parent5196cd6e8c577d35c5788df70c7c59d8e7176183
[MERGE] from trunk

bzr revid: chm@openerp.com-20140318102102-ug0ny6q360i4o1e6
addons/website/controllers/main.py
addons/website/models/website.py
addons/website/static/src/js/website.js
addons/website_sale/views/website_sale.xml