[MERGE] trunk
authoropenerp-sle <openerp-sle@openerp-sle.home>
Sun, 16 Feb 2014 10:36:09 +0000 (11:36 +0100)
committeropenerp-sle <openerp-sle@openerp-sle.home>
Sun, 16 Feb 2014 10:36:09 +0000 (11:36 +0100)
bzr revid: openerp-sle@openerp-sle.home-20140216103609-ihf3bz4nf4rds5ue

1  2 
addons/website/views/website_templates.xml