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

author	Thibault Delavallée <tde@openerp.com>
	Wed, 2 Oct 2013 13:38:20 +0000 (15:38 +0200)
committer	Thibault Delavallée <tde@openerp.com>
	Wed, 2 Oct 2013 13:38:20 +0000 (15:38 +0200)
commit	54933118a4f9d76f53b739d1e5156612d932af53
tree	077783d9c4c3c0487d5b5faf0942bbafd5032d17	tree \| snapshot
parent	6069810f0373cc470779bb4eca86f29105c18e45	commit \| diff
parent	5639037c14c7884ea8c8a2a7e52086d21d025934	commit \| diff

[MERGE] Sync with trunk until revision 4957.

bzr revid: tde@openerp.com-20131002133820-8xomdumexexqp3pk

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

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/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/tests/test_views.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/convert.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/mail.py	diff1 \|	diff2 \|	blob \| history