[MERGE]: Merge with lp:~xrg/openobject-addons/trunk-caldav4
authorrpa (Open ERP) <rpa@tinyerp.com>
Thu, 12 Aug 2010 11:30:48 +0000 (17:00 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Thu, 12 Aug 2010 11:30:48 +0000 (17:00 +0530)
commit3237b6f39661837c74bca5b9846703a5c6f30ae8
treefcf10b67ca6ab2328f7cc4888b2bff062cb1ebc8
parenta566e35d20dad3ed5ac743b3411fefcb2ae21863
parentddae08c774b67429feca92aa5aac09a28128a694
[MERGE]: Merge with lp:~xrg/openobject-addons/trunk-caldav4

bzr revid: rpa@tinyerp.com-20100812113048-c5rmoykds5gwuzew