git.inspyration.org Git - odoo/odoo.git/commit - openerp/addons/base/ir/ir

author	Christophe Simonis <chs@openerp.com>
	Thu, 12 Sep 2013 15:06:16 +0000 (17:06 +0200)
committer	Christophe Simonis <chs@openerp.com>
	Thu, 12 Sep 2013 15:06:16 +0000 (17:06 +0200)
commit	e13ffe7e11e4ba1afb0aa151bb28a05139466130
tree	49cb91bd455f7d9c26a7f66c72d2b75753061d81	tree \| snapshot
parent	b5f38f8b7d744681ceef9955f769e769c25df518	commit \| diff
parent	1d91378ce22bc75807c0d178c9ccbae3541e1e18	commit \| diff

[MERGE] forward port of branch 7.0 up to revid 5075 chs@openerp.com-20130912141018-qmcyase8zqov9d01

bzr revid: chs@openerp.com-20130906165207-1oklc8cqs0rex3kg
bzr revid: dle@openerp.com-20130909170248-a4t5y6qd5ikkhhac
bzr revid: dle@openerp.com-20130911083736-6jfkb140jxbbx7j6
bzr revid: chs@openerp.com-20130912150616-v0c383trj7gaa7eu

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

RSS Atom

openerp/addons/base/ir/ir_actions.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_mail_server.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_ui_view.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_users.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/tests/__init__.py	diff1 \|	diff2 \|	blob \| history
openerp/modules/loading.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history