Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'odoo/heads/8.0' into OCB/8.0
Conflicts: openerp/modules/loading.py: solved by using Odoo's version which is an improved version on the one present in OCB.
- Loading branch information