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

author	Thibault Delavallée <tde@openerp.com>
	Mon, 9 Jul 2012 08:18:34 +0000 (10:18 +0200)
committer	Thibault Delavallée <tde@openerp.com>
	Mon, 9 Jul 2012 08:18:34 +0000 (10:18 +0200)
commit	4fad550d692da2d79e19973b79f9c976b4c23e45
tree	d9afa975efb7280a5fa5f8882e6025c87c7a75bb	tree \| snapshot
parent	094b1938b885f3d12ebf04c6c2f29ea0e4e48f93	commit \| diff
parent	e9c288b4bf9b82e505ee94a44b5c0e5dfd1f45f8	commit \| diff

[MERGE] Merged with main addons.

bzr revid: tde@openerp.com-20120709081834-18pf4bol39s50uno

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

addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/crm/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
addons/crm/wizard/__init__.py	diff1 \|	diff2 \|	blob \| history
addons/crm/wizard/mail_compose_message.py.THIS	\|	\|	blob
addons/hr_recruitment/hr_recruitment_data.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
addons/mail/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/mail/wizard/mail_compose_message.py	diff1 \|	diff2 \|	blob \| history
addons/project/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
addons/project_issue/project_issue.py	diff1 \|	diff2 \|	blob \| history
addons/project_issue/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history