[commits] Horde branch master updated. f5837a52ccaed5ca26c0a5b0b10c8027a0676499

[Michael M Slusarz]

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

from: 3b2e23b9375c0c5cc57a02768b47c9d1fee75009

552a301 Only show purge trash interval if purging is active
8f955fe [mms] Fix regression in using Virtual Trash (Bug #11478; tonyb at go-concepts.com).
f5837a5 consistent function name

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

commit 552a3013e171eab315633f6eca031c982eeff81a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Oct 8 14:16:07 2012 -0600

    Only show purge trash interval if purging is active

 imp/config/prefs.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/552a3013e171eab315633f6eca031c982eeff81a

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

commit 8f955fe5d16547a31743bd5713d20a05e72a39a4
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Oct 8 14:23:17 2012 -0600

    [mms] Fix regression in using Virtual Trash (Bug #11478; tonyb at go-concepts.com).
    
    Conflicts:
    	imp/lib/Mailbox.php
    	imp/package.xml

 imp/docs/CHANGES    |    2 ++
 imp/lib/Mailbox.php |    2 +-
 imp/lib/Message.php |    8 ++++----
 imp/package.xml     |    1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/8f955fe5d16547a31743bd5713d20a05e72a39a4

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

commit f5837a52ccaed5ca26c0a5b0b10c8027a0676499
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Oct 8 14:25:43 2012 -0600

    consistent function name

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

http://git.horde.org/horde-git/-/commit/f5837a52ccaed5ca26c0a5b0b10c8027a0676499