[cvs] commit: horde/scripts merge.php

[Jan Schneider]

jan         2005-04-13 10:09:45 PDT

  Modified files:
    scripts              merge.php 
  Log:
  Re-add optional join and according parameter.
  
  Revision  Changes    Path
  1.18      +17 -6     horde/scripts/merge.php

  Chora Links:
  http://cvs.horde.org/diff.php/horde/scripts/merge.php?r1=1.17&r2=1.18&ty=u