[MERGE]: Merged with parent branch
authoruco (OpenERP) <uco@tinyerp.co.in>
Mon, 18 Jan 2010 13:47:54 +0000 (19:17 +0530)
committeruco (OpenERP) <uco@tinyerp.co.in>
Mon, 18 Jan 2010 13:47:54 +0000 (19:17 +0530)
commite48fd513004aac8f8572d46e78b32d673dc81e17
treea9b8cd4bb92ae31c25cccaa0f4eb1428f298f334
parent8f83656717dbf12197276fd8ce76701351e41746
parentb5b678f2892832c1f236ae77ed3bdb6d3b188900
[MERGE]: Merged with parent branch

bzr revid: uco@tinyerp.co.in-20100118134754-6rhoc8oocxn3clnz
addons/crm/crm_meeting.py
addons/project/project.py
addons/project/project_view.xml