Merge branch 'upstream/saas-5' into saas-5
-rw-r--r-- 365 .gitignore
-rw-r--r-- 3196 CONTRIBUTING.md
-rw-r--r-- 34922 LICENSE
-rw-r--r-- 1482 README.md
drwxr-xr-x - addons
drwxr-xr-x - doc
-rwxr-xr-x 5717 odoo.py
-rwxr-xr-x 196 openerp-gevent
-rwxr-xr-x 155 openerp-server
-rw-r--r-- 1821 openerp-wsgi.py
drwxr-xr-x - openerp
drwxr-xr-x - setup