merge from cvs:
authorMichael J. Rubinsky <mrubinsk@horde.org>
Sun, 9 May 2010 19:33:21 +0000 (15:33 -0400)
committerMichael J. Rubinsky <mrubinsk@horde.org>
Sun, 9 May 2010 19:33:21 +0000 (15:33 -0400)
commitd653cbb76fcb36a689b2df0659349894cb3b9f4d
treeaa8e532b93917133789858811cb788b45c514d93
parent630a32e184831be163232908ce7a99936d834c26
merge from cvs:

[mjr] Do not remove history entries when removing user data (Bug: 8755).
kronolith/docs/CHANGES
kronolith/lib/Application.php
mnemo/docs/CHANGES
mnemo/lib/Api.php
nag/docs/CHANGES
nag/lib/Application.php