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

[Michael M Slusarz]

slusarz     2009-10-27 20:01:49 EDT

  Modified files:        (Branch: FRAMEWORK_3)
    docs                 CHANGES 
    lib                  Compose.php 
  Log:
  Bug: 8661
  Merge from git (horde-hatchery): 1eb0638
  
  Revision     Changes    Path
  1.699.2.410  +1 -0      imp/docs/CHANGES
  1.107.2.87   +32 -7     imp/lib/Compose.php

  Chora Links:
  http://cvs.horde.org/diff.php/imp/docs/CHANGES?rt=horde&r1=1.699.2.409&r2=1.699.2.410&ty=u
  http://cvs.horde.org/diff.php/imp/lib/Compose.php?rt=horde&r1=1.107.2.86&r2=1.107.2.87&ty=u