jan 2003/12/17 07:20:37 PST Modified files: docs CHANGES Log: Merge changelogs. Revision Changes Path 1.115 +47 -30 kronolith/docs/CHANGES Chora Links: http://cvs.horde.org/diff.php/kronolith/docs/CHANGES?r1=1.114&r2=1.115&ty=u