[FIX] crm: merge the phonecalls during an opportunities merge
Merge branch '7.0' of https://github.com/odoo/odoo into 7.0-linux64