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

[MERGE] from trunk

bzr revid: xmo@openerp.com-20121010154436-wz29sdkbs9vvhjba

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

openerp/addons/base/ir/ir_actions.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/fields.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history
openerp/tests/addons/test_impex/tests/test_import.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/misc.py	diff1 \|	diff2 \|	blob \| history
setup.py	diff1 \|	diff2 \|	blob \| history