[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Tue, 19 Jan 2010 14:48:43 +0000 (20:18 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Tue, 19 Jan 2010 14:48:43 +0000 (20:18 +0530)
commitfb1e56bb43deea8705567bb01e75675c269fb11d
treed8a5ce77519fa75e3aefe6c0e03c5a6213302b8b
parentf5a7198e5059148a0ebf4051acc92d40d163c805
parent83be9958bb217b0969ff68cdaf39677e5a738560
[MERGE]

bzr revid: hmo@tinyerp.com-20100119144843-2dwq2c5jm5clnx5w
addons/caldav/common.py