[Pkg-telepathy-commits] [empathy] 02/04: Merge tag 'upstream/3.12.4' 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 f23e749c5ed95b6ac405a751cceb4d946cd838bc
Merge: ef31113 4ef8ea9
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Mon Jun 30 12:11:31 2014 +0200

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

 ChangeLog                                | 143 +++++++++++
 NEWS                                     |   6 +
 configure                                |  20 +-
 configure.ac                             |   2 +-
 data/empathy.desktop                     |   2 +-
 data/empathy.desktop.in                  |   2 +-
 libempathy-gtk/empathy-individual-menu.c | 415 ++++++++++++++++++++++---------
 libempathy-gtk/empathy-individual-menu.h |   4 +-
 libempathy-gtk/empathy-individual-view.c |   6 +-
 libempathy-gtk/empathy-smiley-manager.c  |  68 +++--
 10 files changed, 517 insertions(+), 151 deletions(-)

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