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

[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20110831091325-t5gfm57tmkr0fbee

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

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