[Pkg-telepathy-commits] [empathy] 02/12: Merge tag 'upstream/3.12.0+65+g1dfa999' 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 881e6ce0308ef9146d5c0953db28cdfc2b46596b
Merge: 709c041 a27594d
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Apr 2 20:42:19 2014 +0100

    Merge tag 'upstream/3.12.0+65+g1dfa999' into telepathy1
    
    Upstream version 3.12.0+65+g1dfa999

 ChangeLog                                          | 111851 ++++++++++++++++++
 configure                                          |     20 +-
 data/empathy.desktop                               |      2 +-
 data/empathy.desktop.in                            |      2 +-
 libempathy/empathy-client-factory.c                |     10 +-
 libempathy/empathy-tp-chat.c                       |      1 -
 libempathy/empathy-utils.c                         |     16 +-
 src/empathy-auth-client.c                          |     13 +-
 src/empathy-debug-window.c                         |    108 +-
 .../tp-account-widgets/Makefile.am                 |      6 +
 .../tp-account-widgets/Makefile.in                 |     10 +-
 .../tp-account-widgets/tpaw-connection-managers.c  |     15 +-
 tests/empathy-tls-test.c                           |     18 +-
 .../account-plugins/empathy-accounts-plugin.c      |     28 +-
 .../account-plugins/empathy-accounts-plugin.h      |      1 +
 .../cc-plugins/app-plugin/empathy-app-plugin.c     |     26 +-
 .../cc-plugins/app-plugin/empathy-app-plugin.h     |      1 +
 17 files changed, 112014 insertions(+), 114 deletions(-)

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