git.inspyration.org Git - odoo/odoo.git/commit

[MERGE] sync with latest trunk

bzr revid: odo@openerp.com-20110922154155-jq811w768d9zfgim

Unnamed repository; edit this file 'description' to name the repository.

openerp/addons/base/ir/ir_model.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_currency.py	diff1 \|	diff2 \|	blob \| history
openerp/modules/loading.py	diff1 \|	diff2 \|	blob \| history
openerp/modules/registry.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/expression.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/fields.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history