[Pkg-xmpp-commits] [jabberd2] 03/05: Merge tag 'upstream/2.5.0'

[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 a8403eef13b68416cf3c57d56d3bf62e9ca4224f
Merge: b88f111 1023a48
Author: Simon Josefsson <simon at josefsson.org>
Date:   Sat Mar 4 09:00:48 2017 +0100

    Merge tag 'upstream/2.5.0'
    
    Upstream version 2.5.0
    
    # gpg: Signatur gjordes lör  4 mar 2017 09:00:47 CET med RSA nyckel-id 32F8119D
    # gpg: Korrekt signatur från "Simon Josefsson <simon at josefsson.org>"
    # gpg:       även känd som "Simon Josefsson <simon at yubico.com>"

 NEWS                    | 13 +++++++++++++
 README.md               |  1 +
 c2s/main.c              |  3 ++-
 configure.ac            |  2 +-
 etc/c2s.xml.dist.in     |  4 +---
 sm/main.c               | 17 -----------------
 sm/mod_iq_private.c     |  1 +
 sm/mod_privacy.c        |  1 +
 storage/storage_pgsql.c | 15 ++++++++++++++-
 9 files changed, 34 insertions(+), 23 deletions(-)

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