Merge
authorAlicia FLOREZ <alic.florez@gmail.com>
Thu, 12 Jun 2014 08:02:47 +0000 (10:02 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Thu, 12 Jun 2014 08:02:47 +0000 (10:02 +0200)
1  2 
addons/website/views/website_templates.xml
openerp-wsgi.py

diff --cc openerp-wsgi.py
Simple merge