[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Mon, 8 Mar 2010 10:58:08 +0000 (16:28 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Mon, 8 Mar 2010 10:58:08 +0000 (16:28 +0530)
commit748a44059e2cb5b9085df30e41c79458362b4f81
tree29c7c8b94a3b25eabc6bc32da80f59f1493b5a2e
parentbc8ede63ce255d6b3d2fb5fb8ff5fffe0503c061
parent3b04171221de08948f82c977b63c457ea1539dd1
[MERGE]

bzr revid: hmo@tinyerp.com-20100308105808-daycevll1sgvayfl
addons/base_calendar/base_calendar_data.xml
addons/caldav/caldav_data.xml
addons/caldav/security/ir.model.access.csv
addons/project_caldav/wizard/__init__.py
addons/project_caldav/wizard/wizard_cal_export.py
addons/project_caldav/wizard/wizard_cal_import.py