[commits] Horde branch develop updated. e95e0ff02440dc17c62f87ce59a652180aea10ff

[Michael M Slusarz]

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

from: db9f2cc898b5017e3b526e49066a6890e1ff7a55

5599f30 Only override procmail variables if using Maildir (Bug #10113)
a59eab2 Bug #11227 Fix reveresed logic. Signed-off-by: Michael J Rubinsky <mrubinsk at horde.org>
b43fd64 Improved algorithm for determining base subject text
a606283 [jan] Fix getViewLink() API method (Bug #11226).
005bf85 [mms] Only allow display of basic image types directly in browser.
e95e0ff Merge branch 'master' into develop

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

commit 5599f3052996002509b579f2608cab16bc8eec20
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Jun 21 09:15:49 2012 -0600

    Only override procmail variables if using Maildir (Bug #10113)

 ingo/config/backends.php     |   12 ++++++------
 ingo/lib/Script/Procmail.php |   21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/5599f3052996002509b579f2608cab16bc8eec20

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

commit a59eab2e4255dee39e1dece6da428ab141fd1a03
Author: maxime at chavagne.net <maxime at chavagne.net>
Date:   Fri Jun 22 17:42:04 2012 -0400

    Bug #11227 Fix reveresed logic.
    Signed-off-by: Michael J Rubinsky <mrubinsk at horde.org>

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

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

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

commit b43fd641cb135e2b3a9c3f408f82ccb38987cd5b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jun 22 15:31:10 2012 -0600

    Improved algorithm for determining base subject text

 framework/Imap_Client/lib/Horde/Imap/Client/Utils.php             |   23 ++---
 framework/Imap_Client/test/Horde/Imap/Client/SubjectParseTest.php |   10 ++
 2 files changed, 20 insertions(+), 13 deletions(-)

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

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

commit a60628364dcca0ee7bb182b31b23b887e64ee1d4
Author: Jan Schneider <jan at horde.org>
Date:   Sat Jun 23 13:34:58 2012 +0200

    [jan] Fix getViewLink() API method (Bug #11226).

 gollem/docs/CHANGES |    1 +
 gollem/lib/Api.php  |   17 +++++++++--------
 gollem/package.xml  |    2 ++
 3 files changed, 12 insertions(+), 8 deletions(-)

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

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

commit 005bf859ca78a495a0756b7c681e7bbd26c65895
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jun 25 15:24:19 2012 -0600

    [mms] Only allow display of basic image types directly in browser.

 imp/docs/CHANGES               |    1 +
 imp/lib/Mime/Viewer/Images.php |   31 ++++++++++++++++++++++++-------
 imp/package.xml                |    2 ++
 3 files changed, 27 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/005bf859ca78a495a0756b7c681e7bbd26c65895

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

commit e95e0ff02440dc17c62f87ce59a652180aea10ff
Merge: db9f2cc 005bf85
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jun 25 15:26:46 2012 -0600

    Merge branch 'master' into develop
    
    Conflicts:
    	gollem/package.xml
    	imp/lib/Mime/Viewer/Images.php
    	imp/package.xml

 framework/Imap_Client/lib/Horde/Imap/Client/Utils.php             |   23 +-
 framework/Imap_Client/test/Horde/Imap/Client/SubjectParseTest.php |   10 +
 gollem/docs/CHANGES                                               |    1 +
 gollem/lib/Api.php                                                |   17 +-
 gollem/package.xml                                                |    5 +-
 imp/docs/CHANGES                                                  |    1 +
 imp/lib/Mime/Viewer/Images.php                                    |   31 ++-
 imp/package.xml                                                   |   60 +----
 ingo/config/backends.php                                          |   12 +-
 ingo/lib/Script/Procmail.php                                      |   21 ++
 10 files changed, 89 insertions(+), 92 deletions(-)

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