Merge 'upstream/saas-4' into saas-4

diff --git a/openerp-wsgi.py b/openerp-wsgi.py
index 4a3f34d..f4c3a75 100644 (file)
--- a/openerp-wsgi.py
+++ b/openerp-wsgi.py
@@ -26,7 +26,7 @@ conf = openerp.tools.config
 # Path to the OpenERP Addons repository (comma-separated for
 # multiple locations)
 
-conf['addons_path'] = '../../addons/trunk,../../web/trunk/addons'
+conf['addons_path'] = '/opt/odoo/odoo.git/addons,/opt/odoo/custom.git'
 
 # Optional database config if not using local socket
 #conf['db_name'] = 'mycompany'