[cvs] commit: ingo/docs CHANGES

[Jan Schneider]

jan         2008-09-05 08:31:15 EDT

  Modified files:        (Branch: FRAMEWORK_3)
    docs                 CHANGES 
  Log:
  Remove merge conflicts.
  
  Revision    Changes    Path
  1.55.2.109  +0 -3      ingo/docs/CHANGES

  Chora Links:
  http://cvs.horde.org/diff.php/ingo/docs/CHANGES?r1=1.55.2.108&r2=1.55.2.109&ty=u