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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b49d944 f37497a)

author	Thibault Delavallée <tde@openerp.com>
	Fri, 19 Jul 2013 10:01:19 +0000 (12:01 +0200)
committer	Thibault Delavallée <tde@openerp.com>
	Fri, 19 Jul 2013 10:01:19 +0000 (12:01 +0200)
commit	163d88ea3277a8bc1d7db217c0e01c5273ba8235
tree	57af8f0145e7b92314ce328ebe11ed4f1ebe79a4	tree \| snapshot
parent	b49d94408f4b2982aef1c1b6b6fc2e59e1f44279	commit \| diff
parent	f37497aaa8ad395b0a5cfd9c8b8be8d8fef1e15b	commit \| diff

[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130719100119-ohpzxw4r1fxta93k

addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/crm/wizard/crm_lead_to_opportunity.py	diff1 \|	diff2 \|	blob \| history
addons/crm/wizard/crm_merge_opportunities.py	diff1 \|	diff2 \|	blob \| history

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