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

author	Antony Lesuisse <al@openerp.com>
	Wed, 24 Aug 2011 16:09:36 +0000 (18:09 +0200)
committer	Antony Lesuisse <al@openerp.com>
	Wed, 24 Aug 2011 16:09:36 +0000 (18:09 +0200)
commit	fd836214635914a8661e1e82f34a818d1ca405bd
tree	86b460d0f3744c784136ed51579630ffe00a60a9	tree \| snapshot
parent	8d08cbf5610bd2df8b9186f2cc3b05e33b191d02	commit \| diff
parent	764de99262779b122be2ee6b52740f0ac917c824	commit \| diff

[MERGE] trunk

bzr revid: al@openerp.com-20110824160936-ej26wcvgvku3lkm7

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_company.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_lang.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_user.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/misc.py	diff1 \|	diff2 \|	blob \| history
setup.py	diff1 \|	diff2 \|	blob \| history