[MERGE] from trunk
authorchm@openerp.com <>
Tue, 8 Apr 2014 13:24:12 +0000 (15:24 +0200)
committerchm@openerp.com <>
Tue, 8 Apr 2014 13:24:12 +0000 (15:24 +0200)
commit673dc5b1d7a86895d78f2d796c1ce485689cd5cc
tree0a190f6e0519f8a3991c707bc9d91368745ca0ed
parent7a905238f299816543ea99d7881f7da5d16eec85
parentdcdf729b9fb2404ac076aa0cd178df2c27dae0fb
[MERGE] from trunk

bzr revid: chm@openerp.com-20140408132412-7ofhd87laj3uoazj
addons/website/controllers/main.py
addons/website/views/snippets.xml
addons/website/views/website_templates.xml