[cvs] commit: imp/lib/Quota command.php hook.php logfile.php maildir.php mercury32.php

[Jan Schneider]

jan         2008-07-02 05:31:16 EDT

  Modified files:        (Branch: FRAMEWORK_3)
    lib/Quota            command.php hook.php logfile.php 
                         maildir.php mercury32.php 
  Log:
  Did the merge script break?
  
  Revision    Changes    Path
  1.11.10.16  +6 -8      imp/lib/Quota/command.php
  1.1.2.3     +1 -11     imp/lib/Quota/hook.php
  1.5.10.6    +9 -11     imp/lib/Quota/logfile.php
  1.1.2.5     +3 -6      imp/lib/Quota/maildir.php
  1.1.10.11   +1 -11     imp/lib/Quota/mercury32.php

  Chora Links:
  http://cvs.horde.org/diff.php/imp/lib/Quota/command.php?r1=1.11.10.15&r2=1.11.10.16&ty=u
  http://cvs.horde.org/diff.php/imp/lib/Quota/hook.php?r1=1.1.2.2&r2=1.1.2.3&ty=u
  http://cvs.horde.org/diff.php/imp/lib/Quota/logfile.php?r1=1.5.10.5&r2=1.5.10.6&ty=u
  http://cvs.horde.org/diff.php/imp/lib/Quota/maildir.php?r1=1.1.2.4&r2=1.1.2.5&ty=u
  http://cvs.horde.org/diff.php/imp/lib/Quota/mercury32.php?r1=1.1.10.10&r2=1.1.10.11&ty=u