[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5139 rev-id: dle@openerp...
authorDenis Ledoux <dle@openerp.com>
Thu, 21 Nov 2013 15:54:57 +0000 (16:54 +0100)
committerDenis Ledoux <dle@openerp.com>
Thu, 21 Nov 2013 15:54:57 +0000 (16:54 +0100)
commit6fd552c3ceae47384aca1ac960cb3fd5f8bbb832
treee9393f18e50bbcbc67767ee3969532203040e84a
parent2cba6a535568471b29fed18bad6fda665ca5d1d1
parent58080c65691a7716e4c57dde8ec15a7e36ae75f5
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5139 rev-id: dle@openerp.com-20131121132305-qjlclgz5v9tze1fr

bzr revid: odo@openerp.com-20131120102545-2tlp031yib6viz35
bzr revid: chs@openerp.com-20131120161708-c8sbom592moukwxw
bzr revid: dle@openerp.com-20131121155457-lh7fzouk2upeiu16
openerp/addons/base/currency_data.xml
openerp/addons/base/ir/ir_attachment.py
openerp/addons/base/ir/ir_translation.py
openerp/addons/base/res/res_country_data.xml
openerp/modules/loading.py
openerp/modules/registry.py
openerp/osv/orm.py
openerp/tools/mail.py