[commits] Horde branch master updated. 32c1a89afc47df58c2f72e9ddbc94bfdcfc2638e

[Jan Schneider]

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

from: 8f61ef8417bcb3980c27172024e8409b9e2b35ea

32c1a89 [jan] Make dependency on File_ASN1 optional.

Summary: http://github.com/horde/horde/compare/8f61ef8417bcb3980c27172024e8409b9e2b35ea...32c1a89afc47df58c2f72e9ddbc94bfdcfc2638e

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

commit 32c1a89afc47df58c2f72e9ddbc94bfdcfc2638e
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jan 16 16:44:53 2015 +0100

    [jan] Make dependency on File_ASN1 optional.
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/package.xml

 imp/docs/CHANGES              |    1 +
 imp/lib/Mime/Viewer/Smime.php |    4 ++++
 imp/package.xml               |    9 +++++----
 3 files changed, 10 insertions(+), 4 deletions(-)

http://github.com/horde/horde/commit/32c1a89afc47df58c2f72e9ddbc94bfdcfc2638e