[Pkg-telepathy-commits] [telepathy-glib] 99/111: Merge branch 'telepathy-glib-0.22'

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-glib.

commit 10259fa5d3b5dddc3b2202a36e4b6b621890fab1
Merge: 087e104 86db955
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Thu Mar 13 15:41:20 2014 +0100

    Merge branch 'telepathy-glib-0.22'
    
    Conflicts:
    	telepathy-glib/contact.c

 telepathy-glib/contact.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)


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