[commits] Horde branch master updated. 9027cce6d2cf6af0f2b6e7659921739b5c567f4e

[Michael M Slusarz]

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

from: 8f5d0d11a358a416d114c7ca1cc97bb93cb4ee0e

1a3b414 backlog -> log
7f2e73e Fix typo preventing vtrash from being disabled
9027cce Don't output default encryption option if no encryption is available

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

commit 1a3b4141e6e185c8c4cb3b78a68a56ec1fbd4859
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Fri Jan 7 00:40:04 2011 -0700

    backlog -> log
    
    backlog = tasks/items you have not yet accomplished
    log = historical list of past items

 imp/templates/dimp/javascript_defs.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/1a3b4141e6e185c8c4cb3b78a68a56ec1fbd4859

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

commit 7f2e73ecc7602ff88f809c6077d287e3c99db28c
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Fri Jan 7 11:46:34 2011 -0700

    Fix typo preventing vtrash from being disabled

 imp/lib/Search.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/7f2e73ecc7602ff88f809c6077d287e3c99db28c

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

commit 9027cce6d2cf6af0f2b6e7659921739b5c567f4e
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Fri Jan 7 11:56:42 2011 -0700

    Don't output default encryption option if no encryption is available

 imp/lib/IMP.php |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/9027cce6d2cf6af0f2b6e7659921739b5c567f4e