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

author	Thibault Delavallée <tde@openerp.com>
	Fri, 11 May 2012 12:46:43 +0000 (14:46 +0200)
committer	Thibault Delavallée <tde@openerp.com>
	Fri, 11 May 2012 12:46:43 +0000 (14:46 +0200)
commit	7a553f429b713b9bab878f314f1701734fed4753
tree	9b63574156b2ece5b493678aa7c42b29505dbf8d	tree \| snapshot
parent	35b0b58b3ed3f6b9791f8e2d4770dc682abcc40c	commit \| diff
parent	420e45e1394c3e7a537de493802c0eb1c39f9200	commit \| diff

[MERGE] Merged with main addons.

bzr revid: tde@openerp.com-20120511124643-y1rsa0ouh3e6xq1k

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

addons/account/i18n/ja.po	diff1 \|	diff2 \|	blob \| history
addons/account_coda/i18n/ja.po	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead_view.xml	diff1 \|	diff2 \|	blob \| history
addons/email_template/email_template.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_group_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_message.py	diff1 \|	diff2 \|	blob \| history
addons/mail/res_users.py	diff1 \|	diff2 \|	blob \| history
addons/project_planning/project_planning_view.xml	diff1 \|	diff2 \|	blob \| history