[Pkg-telepathy-commits] [telepathy-mission-control-6] 38/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 72ad97c5ec8fdfe4cf945bc649445da9c72db86d
Merge: 4f4ed24 d0af8d6
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Oct 2 13:46:26 2013 +0100

    Merge branch 'telepathy-mission-control-5.16'
    
    Conflicts:
    	tests/twisted/account-manager/avatar-refresh.py
    	tests/twisted/constants.py
    	tests/twisted/mctest.py


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