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

author	Thibault Delavallée <tde@openerp.com>
	Wed, 22 May 2013 11:42:36 +0000 (13:42 +0200)
committer	Thibault Delavallée <tde@openerp.com>
	Wed, 22 May 2013 11:42:36 +0000 (13:42 +0200)
commit	cd278d83abd291209d7c3f18ee8eb9ab43a4158a
tree	8d866ce7e1d365667e0a4fe9e85b10f15d36ea3d	tree \| snapshot
parent	c1cb8bf7653d98153c43e0ee35eb3558438e0b78	commit \| diff
parent	d4d6e882668cfdc7c4634a0e30a047d0c83c75a7	commit \| diff

[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130522103305-yi5ql1chdx9qxxlx
bzr revid: tde@openerp.com-20130522114236-qi2s3i2dl2lemdvh

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

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_mail.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/js/mail.js	diff1 \|	diff2 \|	blob \| history
addons/mail/tests/test_mail_features.py	diff1 \|	diff2 \|	blob \| history
addons/mail/tests/test_mail_gateway.py	diff1 \|	diff2 \|	blob \| history
addons/portal/__init__.py	diff1 \|	diff2 \|	blob \| history
addons/portal/mail_mail.py	diff1 \|	diff2 \|	blob \| history
addons/portal/tests/test_portal.py	diff1 \|	diff2 \|	blob \| history