[FIX] #3670 Don't override previous value if no journal is found
Merge branch 'fix_expense_default_journal' into 7.0
[FIX] #3762 Change the domain used in Message-id and allow to match old hosts as well
Merge branch '7.0' of github.com:anybox/odoo into 7.0