[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Fri, 30 Jul 2010 06:57:47 +0000 (12:27 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Fri, 30 Jul 2010 06:57:47 +0000 (12:27 +0530)
bzr revid: hmo@tinyerp.com-20100730065747-z6dngo0mtk7vh0ov

1  2 
addons/base_calendar/base_calendar.py

Simple merge