[commits] Horde branch FRAMEWORK_4 updated. a4de0d9e61b75d416ce0992e9235dcad2413e26e

[Jan Schneider]

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

from: 1d857d1d1a20f6ac767b9a090e9a4857ab56a06a

2aaf8a9 [jan] Throw exception if parsing of S/MIME certificates fails (Bug #11530).
a4de0d9 [jan] Catch exceptions from Horde_Crypt (Bug #11530).

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

commit 2aaf8a963b262663115fe04969a0ca6a17025b6f
Author: Jan Schneider <jan at horde.org>
Date:   Wed Oct 17 14:40:39 2012 +0200

    [jan] Throw exception if parsing of S/MIME certificates fails (Bug #11530).
    
    Conflicts:
    
    	framework/Crypt/package.xml

 framework/Crypt/lib/Horde/Crypt/Smime.php |    3 +++
 framework/Crypt/package.xml               |    2 ++
 2 files changed, 5 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/2aaf8a963b262663115fe04969a0ca6a17025b6f

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

commit a4de0d9e61b75d416ce0992e9235dcad2413e26e
Author: Jan Schneider <jan at horde.org>
Date:   Wed Oct 17 14:41:12 2012 +0200

    [jan] Catch exceptions from Horde_Crypt (Bug #11530).
    
    Conflicts:
    
    	framework/Core/package.xml

 framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php |    9 ++++++++-
 framework/Core/package.xml                            |    2 ++
 2 files changed, 10 insertions(+), 1 deletions(-)

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