[commits] Horde branch master updated. 7cf8eb1962d847f8e903261c3a997fb0b1a81d1d

[Michael M Slusarz]

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

from: a589795b472eb7c7bd97678e777b0f381a0d854e

70205ac Not needed due to change in Horde_Crypt library
667c3a1 Merge branch 'imp_7_0'
7cf8eb1 documentation

Summary: http://github.com/horde/horde/compare/a589795b472eb7c7bd97678e777b0f381a0d854e...7cf8eb1962d847f8e903261c3a997fb0b1a81d1d

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

commit 70205ac2d7d709d961adeafbc5213ed549e2d075
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Oct 30 09:19:12 2012 -0600

    Not needed due to change in Horde_Crypt library

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

http://github.com/horde/horde/commit/70205ac2d7d709d961adeafbc5213ed549e2d075

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

commit 667c3a1680413344e0f8eccddf7806ed1a326053
Merge: a589795 70205ac
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jul 16 00:08:01 2014 -0600

    Merge branch 'imp_7_0'

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

http://github.com/horde/horde/commit/667c3a1680413344e0f8eccddf7806ed1a326053

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

commit 7cf8eb1962d847f8e903261c3a997fb0b1a81d1d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jul 16 01:20:46 2014 -0600

    documentation

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

http://github.com/horde/horde/commit/7cf8eb1962d847f8e903261c3a997fb0b1a81d1d