[Pkg-telepathy-commits] [telepathy-gabble-1] 02/11: Merge tag 'upstream/0.99.8+21+ga9f4bc0' into debian

[Simon McVittie]

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

smcv pushed a commit to branch debian
in repository telepathy-gabble-1.

commit dd86ba59acd7cf0bb8ddb519e2180bf0e6436102
Merge: eb1d3e8 1a19dbe
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Apr 2 17:13:54 2014 +0100

    Merge tag 'upstream/0.99.8+21+ga9f4bc0' into debian
    
    Upstream version 0.99.8+21+ga9f4bc0

 ChangeLog                |  6 ++++++
 src/call-content.c       |  2 +-
 src/call-stream.c        |  2 +-
 src/conn-sidecars.c      |  8 ++++----
 src/connection.c         | 10 ----------
 src/connection.h         |  3 ---
 src/server-tls-channel.c |  2 +-
 src/tls-certificate.c    | 21 ++++++++++-----------
 8 files changed, 23 insertions(+), 31 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-gabble-1.git