[cvs] commit: framework/Perms/Perms sql.php

[Michael Rubinsky]

mrubinsk    2008-05-25 13:50:36 EDT

  Modified files:        (Branch: FRAMEWORK_3)
    Perms/Perms          sql.php 
  Log:
  fix incorrect merge
  
  Revision  Changes    Path
  1.1.2.6   +6 -5      framework/Perms/Perms/sql.php

  Chora Links:
  http://cvs.horde.org/diff.php/framework/Perms/Perms/sql.php?r1=1.1.2.5&r2=1.1.2.6&ty=u