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

[MERGE] merge 6.0 branch.

bzr revid: vmt@openerp.com-20110303133011-758wfx7zompu5ugq

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

openerp/addons/base/__openerp__.py	diff1 \|	\|	blob \| history
openerp/addons/base/i18n/nl.po	diff1 \|	\|	blob \| history
openerp/addons/base/i18n/pt_BR.po	diff1 \|	\|	blob \| history
openerp/addons/base/i18n/vi.po	diff1 \|	\|	blob \| history
openerp/addons/base/ir/ir_rule.py	diff1 \|	\|	blob \| history
openerp/addons/base/ir/workflow/print_instance.py	diff1 \|	\|	blob \| history
openerp/addons/base/res/res_company.py	diff1 \|	\|	blob \| history
openerp/addons/base/res/res_security.xml	diff1 \|	\|	blob \| history
openerp/addons/base/test/test_ir_rule.yml	\|	\|	blob