[commits] Horde branch master updated. d653cbb76fcb36a689b2df0659349894cb3b9f4d

[Michael Rubinsky]

The branch "master" has been updated.
The following is a summary of the commits.

from: 26cb86cd9ec3b26614384dfe35fc1789c7f4e59c

9cdffd5 merge from cvs, make sure we append the session id if needed.
c3efe06 bfn
630a32e Merge from CVS (Bug # 9005).
d653cbb merge from cvs:

-----------------------------------------------------------------------

commit 9cdffd5a47e8231e17b661753326369d66425fda
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Sun May 9 12:02:18 2010 -0400

    merge from cvs, make sure we append the session id if needed.

 ansel/templates/image/edit_image.inc |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

http://git.horde.org/diff.php/ansel/templates/image/edit_image.inc?rt=horde-git&r1=97fd203dcaaf5ddf7c9c2252eb44ac76e8d84846&r2=9cdffd5a47e8231e17b661753326369d66425fda

-----------------------------------------------------------------------

commit c3efe06fc3dceb14326301e39522a92f193f99ca
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Sun May 9 12:04:43 2010 -0400

    bfn

 ansel/docs/CHANGES |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/ansel/docs/CHANGES?rt=horde-git&r1=87379e53707f1ebaa3247db1b4811fe07050c6ea&r2=c3efe06fc3dceb14326301e39522a92f193f99ca

-----------------------------------------------------------------------

commit 630a32e184831be163232908ce7a99936d834c26
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Sun May 9 13:06:46 2010 -0400

    Merge from CVS (Bug # 9005).

 ansel/docs/CHANGES |    1 +
 ansel/lib/Tags.php |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/ansel/docs/CHANGES?rt=horde-git&r1=c3efe06fc3dceb14326301e39522a92f193f99ca&r2=630a32e184831be163232908ce7a99936d834c26
http://git.horde.org/diff.php/ansel/lib/Tags.php?rt=horde-git&r1=240ff73e2a3bcfe5e5649e5d9153d87b25471d36&r2=630a32e184831be163232908ce7a99936d834c26

-----------------------------------------------------------------------

commit d653cbb76fcb36a689b2df0659349894cb3b9f4d
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Sun May 9 15:33:21 2010 -0400

    merge from cvs:
    
    [mjr] Do not remove history entries when removing user data (Bug: 8755).

 kronolith/docs/CHANGES        |    2 +-
 kronolith/lib/Application.php |    3 ---
 mnemo/docs/CHANGES            |    2 +-
 mnemo/lib/Api.php             |   17 -----------------
 nag/docs/CHANGES              |    2 +-
 nag/lib/Application.php       |    3 ---
 6 files changed, 3 insertions(+), 26 deletions(-)

http://git.horde.org/diff.php/kronolith/docs/CHANGES?rt=horde-git&r1=ecad5df422e803d1b11b19f7c02ef933d70d40a9&r2=d653cbb76fcb36a689b2df0659349894cb3b9f4d
http://git.horde.org/diff.php/kronolith/lib/Application.php?rt=horde-git&r1=a861b23f6c641b45228b9a8a2a8cf90e5013be5e&r2=d653cbb76fcb36a689b2df0659349894cb3b9f4d
http://git.horde.org/diff.php/mnemo/docs/CHANGES?rt=horde-git&r1=e3584d4c26d4ef312304e28bd26e038dbe6d50eb&r2=d653cbb76fcb36a689b2df0659349894cb3b9f4d
http://git.horde.org/diff.php/mnemo/lib/Api.php?rt=horde-git&r1=bb701dabc2661d2481fe50ad9f0955f1e736b82d&r2=d653cbb76fcb36a689b2df0659349894cb3b9f4d
http://git.horde.org/diff.php/nag/docs/CHANGES?rt=horde-git&r1=d4491e6b4e0f9ddfd81193f5bed0d914b41a994b&r2=d653cbb76fcb36a689b2df0659349894cb3b9f4d
http://git.horde.org/diff.php/nag/lib/Application.php?rt=horde-git&r1=a861b23f6c641b45228b9a8a2a8cf90e5013be5e&r2=d653cbb76fcb36a689b2df0659349894cb3b9f4d