[MERGE] from trunk
authorchm@openerp.com <>
Wed, 9 Apr 2014 15:45:20 +0000 (17:45 +0200)
committerchm@openerp.com <>
Wed, 9 Apr 2014 15:45:20 +0000 (17:45 +0200)
commit15c035631dd689dd6c02b2503f1769d59d29217c
treeac835723a8de7852e89a21fc6f6f2378f4df6668
parent88eaa5f26fb7a44250eefa3abeb5d14b23559289
parent4a3140be89155cd383a7086f445a1ba82ec10183
[MERGE] from trunk

bzr revid: chm@openerp.com-20140409154520-eddr2h21bei95xxu
addons/website/controllers/main.py
addons/website/static/src/css/website.css
addons/website/static/src/css/website.sass
addons/website/views/snippets.xml