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

author	Thibault Delavallée <tde@openerp.com>
	Mon, 28 Oct 2013 16:33:25 +0000 (17:33 +0100)
committer	Thibault Delavallée <tde@openerp.com>
	Mon, 28 Oct 2013 16:33:25 +0000 (17:33 +0100)
commit	97f164ba998d4509a5b86d1e4c5ce8dd3897181d
tree	14f1ef51bd4637ebc57b005a422c7ae69bd2b55c	tree \| snapshot
parent	d06d6f7fd95f3af6d750541842bc504343e2c3e9	commit \| diff
parent	a56909360679351c5148038259c00a89161c0bc0	commit \| diff

[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20131028163325-2hpks3hp23zop40n

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

openerp/addons/base/ir/ir_attachment.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_fields.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_model.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_translation.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/fields.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history
openerp/tests/test_mail.py	diff1 \|	diff2 \|	blob \| history
openerp/tests/test_mail_examples.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/mail.py	diff1 \|	diff2 \|	blob \| history