[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authoratp (Open ERP) <atp@tinyerp.co.in>
Thu, 23 Dec 2010 10:57:05 +0000 (16:27 +0530)
committeratp (Open ERP) <atp@tinyerp.co.in>
Thu, 23 Dec 2010 10:57:05 +0000 (16:27 +0530)
commit40201bfea2756b5681c8ef265fd8573d6d70726f
tree636d010ca4421d704f2d56cc8accb95601323bed
parentffa6d2dda7b51660f0c647a4598090149c34c72a
parent6b8317f70498d0d180879dff8a59ea05f4153ef7
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: atp@tinyerp.co.in-20101223105705-xyo4vu424j3lhqlt
addons/caldav/calendar.py
addons/crm_claim/report/crm_claim_report.py
addons/crm_claim/report/crm_claim_report_view.xml
addons/document/nodes.py
addons/document_webdav/webdav_server.py