[Pkg-telepathy-commits] [telepathy-mission-control-6] 70/90: Merge tag 'upstream/5.99.8+68+g9ea179a' 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-mission-control-6.

commit 963ad2ed3a4341dea3a687cf3b5eab8c77dce74d
Merge: 0406747 e2ef058
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Apr 2 17:04:53 2014 +0100

    Merge tag 'upstream/5.99.8+68+g9ea179a' into debian
    
    Upstream version 5.99.8+68+g9ea179a

 ChangeLog                       |  99 +++++++++++++++++++++++++++++++
 src/client-registry.c           | 128 +++++++++++++++++++++++++---------------
 src/client-registry.h           |   4 +-
 src/mcd-account-manager.c       |  57 ++++--------------
 src/mcd-account-manager.h       |   2 +-
 src/mcd-account.c               |  39 ++++++------
 src/mcd-client-priv.h           |   2 +-
 src/mcd-client.c                |   4 +-
 src/mcd-dispatch-operation.c    |   9 +--
 src/mcd-dispatcher.c            |  48 ++++++++-------
 src/mcd-dispatcher.h            |   2 +-
 src/mcd-handler-map-priv.h      |   2 +-
 src/mcd-handler-map.c           |  33 ++++++-----
 src/mcd-manager.c               |  10 +---
 src/mcd-master.c                |  39 ++++++------
 src/mcd-master.h                |   2 +-
 src/mcd-service.c               |  20 ++++---
 src/request.c                   |  11 ++--
 tests/twisted/mc-debug-server.c |  27 +++++----
 tests/twisted/mcp-plugin.c      |  21 +++++--
 util/mc-tool.c                  |  16 ++---
 21 files changed, 340 insertions(+), 235 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git