Merge branch 'master' into fix-identation-pep8
[FIX] PEP8 in setup.py
Merge branch 'whitespaces-blank-lines' into pep8
[FIX] PEP8 whitespaces and unexpected indent
Merge branch 'pep8' into cleaned-alfa
Merge branch 'cleaned-alfa' of github.com:jhg/odoo into cleaned-alfa
Delete blank lines with whitespaces