[MERGE]: Merged lp:openobject-addons

author Atul Patel (OpenERP) <atp@tinyerp.com>

Wed, 16 May 2012 06:15:36 +0000 (11:45 +0530)

committer Atul Patel (OpenERP) <atp@tinyerp.com>

Wed, 16 May 2012 06:15:36 +0000 (11:45 +0530)
author Atul Patel (OpenERP) <atp@tinyerp.com>
Wed, 16 May 2012 06:15:36 +0000 (11:45 +0530)
committer Atul Patel (OpenERP) <atp@tinyerp.com>
Wed, 16 May 2012 06:15:36 +0000 (11:45 +0530)
diff --cc addons/event/event.py
Simple merge
diff --cc addons/event/event_view.xml
Simple merge
diff --cc addons/sale/sale_view.xml
Simple merge
author	Atul Patel (OpenERP) <atp@tinyerp.com>
	Wed, 16 May 2012 06:15:36 +0000 (11:45 +0530)
committer	Atul Patel (OpenERP) <atp@tinyerp.com>
	Wed, 16 May 2012 06:15:36 +0000 (11:45 +0530)
		1	2
addons/event/event.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/event/event_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/sale/sale_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history