[cvs] commit: kronolith/docs CHANGES kronolith/lib api.php

[Chuck Hagenbuch]

chuck       2009-06-03 22:23:15 EDT

  Modified files:        (Branch: FRAMEWORK_3)
    docs                 CHANGES 
    lib                  api.php 
  Log:
  Merge from Git:
  [cjh] Fix the signature of the kronolith/import API method
  (rpolli at babel.it, Bug #8309).
  
  Revision     Changes    Path
  1.165.2.262  +2 -0      kronolith/docs/CHANGES
  1.126.2.60   +2 -2      kronolith/lib/api.php

  Chora Links:
  http://cvs.horde.org/diff.php/kronolith/docs/CHANGES?rt=horde&r1=1.165.2.261&r2=1.165.2.262&ty=u
  http://cvs.horde.org/diff.php/kronolith/lib/api.php?rt=horde&r1=1.126.2.59&r2=1.126.2.60&ty=u