[commits] Horde branch master updated. 6090d2c080ad6d8a23df3b3da25bcccfccd6368a

[Jan Schneider]

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

from: 46846194e1ce7e4a9f3b53f4c16786c60e3cff80

6090d2c [jan] Fix fatal error when importing a PGP key (Bug #12318).

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

commit 6090d2c080ad6d8a23df3b3da25bcccfccd6368a
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jun 7 11:46:34 2013 +0200

    [jan] Fix fatal error when importing a PGP key (Bug #12318).

 imp/docs/CHANGES      |    1 +
 imp/lib/Basic/Pgp.php |    2 +-
 imp/package.xml       |    2 ++
 3 files changed, 4 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/6090d2c080ad6d8a23df3b3da25bcccfccd6368a