[Pkg-telepathy-commits] [telepathy-mission-control-6] 165/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 f639eb12ac2ecb47688fad82291f93ccb312a4df
Merge: b65bca4 d4471cc
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Jan 29 19:25:23 2014 +0000

    Merge branch 'telepathy-mission-control-5.16'
    
    Conflicts:
    	NEWS

 NEWS           | 2 ++
 util/mc-tool.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --cc NEWS
index e1b9278,1a5a352..8da57f6
--- a/NEWS
+++ b/NEWS
@@@ -81,6 -24,6 +81,8 @@@ Fixes
  • connectivity-monitor: start watching 'use-conn' key in constructed,
    fixing the ability to switch it off (Guillaume Desmottes)
  
++• don't crash in 'mc-tool auto-presence' subcommand (fd.o #74187, Simon)
++
  telepathy-mission-control 5.16.0 (2013-10-02)
  =============================================
  

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