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

author	Raphael Collet <rco@openerp.com>
	Thu, 11 Apr 2013 07:30:17 +0000 (09:30 +0200)
committer	Raphael Collet <rco@openerp.com>
	Thu, 11 Apr 2013 07:30:17 +0000 (09:30 +0200)
commit	05851d21ba226f455d60674eb78887892d64f22f
tree	9f5b0ee8d88c208fdb72bb3f10760c6d59c2dc38	tree \| snapshot
parent	b99398fa2908124310efd65e853b11a79998764c	commit \| diff
parent	4804af59bdd4363148c514d8471e8333dec1d095	commit \| diff

[MERGE] from trunk

bzr revid: rco@openerp.com-20130411073017-x6e4h8xbvmy3ofdw

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

openerp/addons/base/ir/ir_actions.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_attachment.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_cron.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_model.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_ui_view.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/orm.py	diff1 \|	diff2 \|	blob \| history
openerp/service/model.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/translate.py	diff1 \|	diff2 \|	blob \| history