[Pkg-telepathy-commits] [telepathy-mission-control-6] 10/280: Merge branch 'telepathy-mission-control-5.16'

[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 edb32f061e80240325419ebb3e63102791a297dc
Merge: 6883eb8 79e1df1
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 19 15:22:40 2013 +0100

    Merge branch 'telepathy-mission-control-5.16'

 .gitignore                              |   2 +
 NEWS                                    |  30 ++++++-
 configure.ac                            |   3 +-
 src/mcd-account-manager-default.c       |   3 +-
 src/mcd-account.c                       |   7 +-
 src/mcd-connection.c                    |   2 +-
 src/mcd-debug.h                         |   2 +-
 src/mcd-dispatcher.c                    |   2 +-
 tests/account-store.c                   |   4 +-
 tests/twisted/Makefile.am               | 136 ++++++++--------------------
 tests/twisted/README                    |  12 +--
 tests/twisted/run-test.sh.in            | 153 ++++++++++++++++++++++++++------
 tests/twisted/tools/exec-with-log.sh.in |  18 ++--
 tests/twisted/tools/run-mc.sh.in        |  22 +++++
 14 files changed, 249 insertions(+), 147 deletions(-)


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