[Pkg-xmpp-commits] [jabberd2] 04/11: Merge tag 'upstream/2.6.1'

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script.

jas pushed a commit to branch master
in repository jabberd2.

commit dc907b64c1351d6958bb15d2afe8f8c1d0c650f2
Merge: 26bd782 4e93438
Author: Simon Josefsson <simon at josefsson.org>
Date:   Sun Jul 9 08:29:36 2017 +0200

    Merge tag 'upstream/2.6.1'
    
    Upstream version 2.6.1
    
    # gpg: Signature made sön  9 jul 2017 08:29:35 CEST
    # gpg:                using RSA key 99415CE1905D0E55A9F88026860B7FBB32F8119D
    # gpg: Good signature from "Simon Josefsson <simon at josefsson.org>" [ultimate]
    # gpg:                 aka "Simon Josefsson <simon at yubico.com>" [ultimate]

 NEWS         | 8 ++++++++
 c2s/main.c   | 2 ++
 configure.ac | 2 +-
 sx/sasl.c    | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xmpp/jabberd2.git