[Pkg-telepathy-commits] [telepathy-mission-control-6] 245/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 ea63753dbccb7fa617496c3c0d3d0d2bc0351bc3
Merge: 4bb5c7c c86536f
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Feb 3 16:38:31 2014 +0000

    Merge branch 'telepathy-mission-control-5.16'
    
    Conflicts:
    	src/Makefile.am


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