[cvs] commit: imp/docs CHANGES imp/lib/IMAP Tree.php

[Michael M Slusarz]

slusarz     2009-05-15 17:40:02 EDT

  Modified files:        (Branch: FRAMEWORK_3)
    docs                 CHANGES 
    lib/IMAP             Tree.php 
  Log:
  Bug: 8254
  Submitted by: m.gabriel at das-netzwerkteam.de
  Fix impartial merge from git.
  
  Revision     Changes    Path
  1.699.2.391  +1 -0      imp/docs/CHANGES
  1.25.2.70    +5 -4      imp/lib/IMAP/Tree.php

  Chora Links:
  http://cvs.horde.org/diff.php/imp/docs/CHANGES?rt=horde&r1=1.699.2.390&r2=1.699.2.391&ty=u
  http://cvs.horde.org/diff.php/imp/lib/IMAP/Tree.php?rt=horde&r1=1.25.2.69&r2=1.25.2.70&ty=u