[Pkg-telepathy-commits] [telepathy-mission-control-6] 89/90: Merge tag 'upstream/5.99.11' 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 d1f463e00a1db8fba1d7d04b54a83b94f59d4a5f
Merge: 6b0a6f4 78bb4df
Author: Simon McVittie <smcv at debian.org>
Date:   Wed May 14 10:52:03 2014 +0100

    Merge tag 'upstream/5.99.11' into debian
    
    Upstream version 5.99.11

 ChangeLog                                          |  88 ++++++++++++++++++
 NEWS                                               |  15 +++
 aclocal.m4                                         |  55 +++++++++++
 configure                                          |  20 ++--
 configure.ac                                       |   2 +-
 .../html/McpDispatchOperation.html                 |  35 ++++---
 .../mission-control-plugins/html/McpRequest.html   |   6 +-
 .../html/annotation-glossary.html                  |   4 -
 .../html/api-index-full.html                       |  16 ++--
 .../mission-control-plugins/html/index.sgml        |   6 +-
 .../mission-control-plugins-McpAccountStorage.html |  68 +++++++-------
 .../html/mission-control-plugins.devhelp2          |   4 +-
 .../mission-control-plugins-sections.txt           |   4 +-
 mission-control-plugins/account-storage.c          | 101 +++++++++------------
 mission-control-plugins/account-storage.h          |  15 ++-
 mission-control-plugins/dispatch-operation.c       |  47 +++++-----
 mission-control-plugins/dispatch-operation.h       |   6 +-
 mission-control-plugins/implementation.h           |   4 +-
 mission-control-plugins/request.c                  |  12 +--
 mission-control-plugins/request.h                  |   4 +-
 src/mcd-account.c                                  |  53 ++++++++---
 src/mcd-channel.c                                  |  12 +--
 src/mcd-channel.h                                  |   2 +-
 src/mcd-dispatcher.c                               |  28 ++----
 src/mcd-dispatcher.h                               |   1 -
 src/plugin-dispatch-operation.c                    |  18 +---
 src/plugin-request.c                               |   8 +-
 src/request.c                                      |  20 +---
 tests/twisted/Makefile.am                          |   2 +-
 tests/twisted/Makefile.in                          |   2 +-
 tests/twisted/constants.py                         |   2 +
 tests/twisted/dbus-account-plugin.c                |  31 +++----
 tests/twisted/dispatcher/cdo-claim.py              |   2 +-
 tests/twisted/dispatcher/redispatch-channels.py    |   4 +-
 tests/twisted/mcp-plugin.c                         |  28 +++---
 tests/twisted/mctest.py                            |   4 +-
 36 files changed, 416 insertions(+), 313 deletions(-)

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