[cvs] commit: framework/Kolab Kolab.php framework/Share/Share kolab.php

Fri Mar 7 07:13:24 UTC 2008

wrobel      2008-03-07 02:13:24 EST

  Modified files:        (Branch: FRAMEWORK_3)
    Kolab                Kolab.php 
    Share/Share          kolab.php 
  Log:
  Merge from HEAD.
  
  Revision    Changes    Path
  1.26.10.23  +13 -21    framework/Kolab/Kolab.php
  1.42.2.6    +1 -2      framework/Share/Share/kolab.php

  Chora Links:
  http://cvs.horde.org/diff.php/framework/Kolab/Kolab.php?r1=1.26.10.22&r2=1.26.10.23&ty=u
  http://cvs.horde.org/diff.php/framework/Share/Share/kolab.php?r1=1.42.2.5&r2=1.42.2.6&ty=u