mrubinsk    2008-05-12 21:36:21 EDT
  Modified files:        (Branch: FRAMEWORK_3)
    Share/Share          sql.php 
  Log:
  Looks like a merge went bad at some point...
  
  Revision  Changes    Path
  1.1.2.25  +2 -4      framework/Share/Share/sql.php
  Chora Links:
  http://cvs.horde.org/diff.php/framework/Share/Share/sql.php?r1=1.1.2.24&r2=1.1.2.25&ty=u