[Pkg-telepathy-commits] [empathy] 05/12: Merge tag 'upstream/3.12.0+66+g529cd04' into telepathy1

[Simon McVittie]

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

smcv pushed a commit to branch telepathy1
in repository empathy.

commit ffe727481b328916b2a79b4ff56543220ce6d7f2
Merge: 4aeb77d 7829430
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Apr 3 19:40:14 2014 +0100

    Merge tag 'upstream/3.12.0+66+g529cd04' into telepathy1
    
    Upstream version 3.12.0+66+g529cd04

 ChangeLog                            | 27 ++++++++++++++++++++++-----
 libempathy-gtk/empathy-plist.c       |  1 +
 libempathy-gtk/empathy-theme-adium.c |  1 +
 libempathy-gtk/empathy-tls-dialog.c  |  1 +
 libempathy/empathy-contact.c         |  1 +
 libempathy/empathy-tls-verifier.c    |  1 +
 src/empathy-auth-client.c            |  1 +
 src/empathy-import-pidgin.c          |  1 +
 src/empathy-import-utils.c           |  1 +
 9 files changed, 30 insertions(+), 5 deletions(-)

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