git.inspyration.org Git - odoo/odoo.git/commit - addons/crm/crm.py

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 26fd182 a7ddf7c)

author	Sanjay Gohel (Open ERP) <sgo@tinyerp.com>
	Mon, 17 Dec 2012 05:06:59 +0000 (10:36 +0530)
committer	Sanjay Gohel (Open ERP) <sgo@tinyerp.com>
	Mon, 17 Dec 2012 05:06:59 +0000 (10:36 +0530)
commit	de45fd4fc1b7cea8c59852707c273b65951b3fc7
tree	94d2cfa28bb9ef813f81f9916478df581426430e	tree \| snapshot
parent	26fd182e3211eedfd5edd2686ea1e988e978b85a	commit \| diff
parent	a7ddf7c6895dedfafe6e40b005b7a53512f32cfb	commit \| diff

[MERGE]with trunk

bzr revid: sgo@tinyerp.com-20121217050659-q5w6zwefizgjv4fd

addons/crm/crm.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/mail/tests/test_mail_features.py	\|	diff2 \|	blob \| history
addons/project/project.py	diff1 \|	diff2 \|	blob \| history
addons/project/project_view.xml	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history

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