Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme
authorFabien Meghazi <fme@openerp.com>
Wed, 21 May 2014 08:29:04 +0000 (10:29 +0200)
committerFabien Meghazi <fme@openerp.com>
Wed, 21 May 2014 08:29:04 +0000 (10:29 +0200)
commit593cdf427f5ae58c7def53230ac65a3268f8dde2
tree206eec58a6b7eae5b1940bec99a786574eb9d946
parent863edbaaf29eddbce8fad80ed7d66659acd8e9a9
parenta756b823727b763310fb7d1a24c594f3d78cffe5
Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme
addons/website/views/website_templates.xml