[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5229 revid:launchpad_translat...
authorDenis Ledoux <dle@openerp.com>
Tue, 11 Feb 2014 16:39:02 +0000 (17:39 +0100)
committerDenis Ledoux <dle@openerp.com>
Tue, 11 Feb 2014 16:39:02 +0000 (17:39 +0100)
commit1b2c0f74dcc21e3060bc35ec64b90e07c02f5507
treea98e5b750910d6e01010299fda0475a20936f364
parent722163893e693cbbfe70050ad29e5740443a2a5d
parentc438e6e8a95a698785ce903aec0f8f9578f7bcf0
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5229 revid:launchpad_translations_on_behalf_of_openerp-20140211064034-ghuxxk02n715othj

bzr revid: dle@openerp.com-20140211163902-ya86jr7lwlj1mkk9
openerp/osv/orm.py
openerp/tools/mail.py