[Pkg-telepathy-commits] [empathy] 02/02: Merge tag 'upstream/3.12.3' into debian

[Laurent Bigonville]

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

bigon pushed a commit to branch debian
in repository empathy.

commit 8ece58c400b46b1b0796f7382914fceff76033cd
Merge: 78493c5 8854dc5
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Jun 11 18:07:00 2014 +0200

    Merge tag 'upstream/3.12.3' into debian
    
    Upstream version 3.12.3

 ChangeLog                               |   47 +
 NEWS                                    |   12 +
 aclocal.m4                              | 3465 +++++++++++++++----------------
 configure                               |   25 +-
 configure.ac                            |    2 +-
 data/empathy.desktop                    |    2 +-
 data/empathy.desktop.in                 |    2 +-
 goa-mc-plugin/mcp-account-manager-goa.c |   13 -
 src/chat-manager-interface.c            |    2 +-
 src/chat-manager-interface.h            |    2 +-
 src/empathy-accounts.c                  |    1 +
 11 files changed, 1807 insertions(+), 1766 deletions(-)

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