[commits] Horde branch master updated. 2061e1638f4f8e98eebc43c220ec3c3a152eb44d

[Michael M Slusarz]

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

from: 740ab415f38b1e39742f9e032aebf2b0bf0f91e8

19c5170 Word wrapping
d0bbaea Place prefs options under correct header
2061e16 Request #6455: Spam reporting on mailbox move.

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

commit 19c517045b298b1c7946b4912d69b2eb82211fbc
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Aug 10 16:20:51 2010 -0600

    Word wrapping

 imp/config/conf.xml |   38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 deletions(-)

http://git.horde.org/diff.php/imp/config/conf.xml?rt=horde-git&r1=19c0155646f0ccddf91d0f33e237b035d401f075&r2=19c517045b298b1c7946b4912d69b2eb82211fbc

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

commit d0bbaeaa3bc69088ae5be2cf166ebf44637aad63
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Aug 10 16:22:51 2010 -0600

    Place prefs options under correct header

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

http://git.horde.org/diff.php/imp/config/prefs.php.dist?rt=horde-git&r1=19c0155646f0ccddf91d0f33e237b035d401f075&r2=d0bbaeaa3bc69088ae5be2cf166ebf44637aad63

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

commit 2061e1638f4f8e98eebc43c220ec3c3a152eb44d
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Aug 10 16:38:35 2010 -0600

    Request #6455: Spam reporting on mailbox move.
    
    Add preference to allow for automatic spam reporting when explicitly
    moving messages to the Spam mailbox.

 imp/config/prefs.php.dist |   11 ++++++++++-
 imp/docs/CHANGES          |    2 ++
 imp/lib/Api.php           |    4 ++--
 imp/lib/Message.php       |   20 ++++++++++++++++----
 imp/lib/Prefs/Ui.php      |   15 +++++++++++----
 imp/lib/Spam.php          |   15 +++++++++++----
 imp/mailbox.php           |    2 +-
 imp/message.php           |    2 +-
 8 files changed, 54 insertions(+), 17 deletions(-)

http://git.horde.org/diff.php/imp/config/prefs.php.dist?rt=horde-git&r1=d0bbaeaa3bc69088ae5be2cf166ebf44637aad63&r2=2061e1638f4f8e98eebc43c220ec3c3a152eb44d
http://git.horde.org/diff.php/imp/docs/CHANGES?rt=horde-git&r1=73d6cbe80185537f3845952d00e351a4a1b26b03&r2=2061e1638f4f8e98eebc43c220ec3c3a152eb44d
http://git.horde.org/diff.php/imp/lib/Api.php?rt=horde-git&r1=5d365dac5c0677af0dba884864092918c12c7245&r2=2061e1638f4f8e98eebc43c220ec3c3a152eb44d
http://git.horde.org/diff.php/imp/lib/Message.php?rt=horde-git&r1=a0ce9ace9c3114b59d4926dd43c89cd19f4794c4&r2=2061e1638f4f8e98eebc43c220ec3c3a152eb44d
http://git.horde.org/diff.php/imp/lib/Prefs/Ui.php?rt=horde-git&r1=1cecd5d8a0a787eeedf60a26ce38d960bb3e06cd&r2=2061e1638f4f8e98eebc43c220ec3c3a152eb44d
http://git.horde.org/diff.php/imp/lib/Spam.php?rt=horde-git&r1=a0ce9ace9c3114b59d4926dd43c89cd19f4794c4&r2=2061e1638f4f8e98eebc43c220ec3c3a152eb44d
http://git.horde.org/diff.php/imp/mailbox.php?rt=horde-git&r1=9d177a34d6758515efe8b79121ce95bae0174d7f&r2=2061e1638f4f8e98eebc43c220ec3c3a152eb44d
http://git.horde.org/diff.php/imp/message.php?rt=horde-git&r1=428c80cce1acba5b78156e0fe904cbe2ca2600b3&r2=2061e1638f4f8e98eebc43c220ec3c3a152eb44d