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

[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 a34b878802d399e2eb8faac3942a19d590778183
Merge: 1823978 9fa3c65
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Sep 20 17:47:23 2013 +0100

    Merge branch 'telepathy-mission-control-5.16' into master
    
    Conflicts:
    	mission-control-plugins/dispatch-operation.c

 Makefile.am                                        |  2 +-
 src/connectivity-monitor.c                         | 10 ++++---
 tests/twisted/README                               | 14 ++++++----
 tests/twisted/account-manager/connectivity.py      |  1 +
 tests/twisted/mc-debug-server.c                    | 14 ++++++++++
 tests/twisted/run-test.sh.in                       | 14 ++++++++--
 ...Account_Interface_External_Password_Storage.xml | 20 +++++++++-----
 xml/Account_Interface_Hidden.xml                   | 25 ++++++++++++++---
 xml/Account_Manager_Interface_Hidden.xml           |  3 +--
 ...onnection_Manager_Interface_Account_Storage.xml | 31 ++++++++++++----------
 10 files changed, 97 insertions(+), 37 deletions(-)

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