[commits] Horde branch master updated. 0490ddbe652af6db485e5086a09f0ecda90203df

[Michael M Slusarz]

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

from: d08653cce66defa3e6f6971af780dc3699080ad7

7221687 Simplify
0490ddb [mms] Added the 'delhide_trash' preference.

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

commit 7221687302a2b76847eec1858aea7ceb889227d2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Apr 5 00:34:55 2012 -0600

    Simplify

 imp/lib/Mailbox.php |   27 ++++++++++-----------------
 1 files changed, 10 insertions(+), 17 deletions(-)

http://git.horde.org/horde-git/-/commit/7221687302a2b76847eec1858aea7ceb889227d2

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

commit 0490ddbe652af6db485e5086a09f0ecda90203df
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Apr 5 00:49:28 2012 -0600

    [mms] Added the 'delhide_trash' preference.

 imp/config/prefs.php |   16 +++++++++++++++-
 imp/docs/CHANGES     |    1 +
 imp/docs/UPGRADING   |   10 ++++++++++
 imp/lib/Mailbox.php  |    2 +-
 imp/package.xml      |    2 ++
 5 files changed, 29 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/0490ddbe652af6db485e5086a09f0ecda90203df