The branch "master" has been updated. The following is a summary of the commits.
from: 4a6352106b93a92e00cd32128457d66d8606afd3 23ae3d2 Unit test for Bug #12152 ccd3125 Don't tie this to a specific minor version 9281a2c [mms] Fix signature verification for PGP combined signed & encrypted messages (Bug #12142). ----------------------------------------------------------------------- commit 23ae3d2699eb42c638be568f8282091f2c5a29e6 Author: Michael M Slusarz <[email protected]> Date: Tue Apr 9 13:13:13 2013 -0600 Unit test for Bug #12152 framework/Text_Filter/test/Horde/Text/Filter/LinkurlsTest.php | 15 +++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/23ae3d2699eb42c638be568f8282091f2c5a29e6 ----------------------------------------------------------------------- commit ccd3125500d68cdec63164baa40556aeba50dbf1 Author: Michael M Slusarz <[email protected]> Date: Tue Apr 9 15:23:55 2013 -0600 Don't tie this to a specific minor version imp/docs/INSTALL | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/ccd3125500d68cdec63164baa40556aeba50dbf1 ----------------------------------------------------------------------- commit 9281a2cda2ec8ed9ae4b25fdee59460b822581b4 Author: Michael M Slusarz <[email protected]> Date: Tue Apr 9 15:28:09 2013 -0600 [mms] Fix signature verification for PGP combined signed & encrypted messages (Bug #12142). Conflicts: imp/lib/Mime/Viewer/Pgp.php imp/package.xml imp/docs/CHANGES | 2 + imp/lib/Crypt/Pgp.php | 44 ++++++++++++++++++++++++++++++++++-------- imp/lib/Mime/Viewer/Pgp.php | 39 ++++++++++++++++++++++++++----------- imp/package.xml | 1 + 4 files changed, 65 insertions(+), 21 deletions(-) http://git.horde.org/horde-git/-/commit/9281a2cda2ec8ed9ae4b25fdee59460b822581b4 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
