[MERGE] removal of 'mark as read/unread' actions

author Quentin (OpenERP) <qdp-launchpad@openerp.com>

Fri, 7 Dec 2012 13:08:08 +0000 (14:08 +0100)

committer Quentin (OpenERP) <qdp-launchpad@openerp.com>

Fri, 7 Dec 2012 13:08:08 +0000 (14:08 +0100)
author Quentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 7 Dec 2012 13:08:08 +0000 (14:08 +0100)
committer Quentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 7 Dec 2012 13:08:08 +0000 (14:08 +0100)
diff --cc addons/base_calendar/crm_meeting_view.xml
Simple merge
diff --cc addons/crm/crm_phonecall_view.xml
Simple merge
diff --cc addons/project_issue/project_issue_view.xml
Simple merge
diff --cc addons/purchase/purchase_view.xml
Simple merge
author	Quentin (OpenERP) <qdp-launchpad@openerp.com>
	Fri, 7 Dec 2012 13:08:08 +0000 (14:08 +0100)
committer	Quentin (OpenERP) <qdp-launchpad@openerp.com>
	Fri, 7 Dec 2012 13:08:08 +0000 (14:08 +0100)
		1	2
addons/base_calendar/crm_meeting_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_phonecall_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/project_issue/project_issue_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history