[Pkg-telepathy-commits] [empathy] 02/04: Merge tag 'upstream/3.12.5' 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 8772e9a2ca430b9ed551ab146882be396c8da2ae
Merge: 9884714 cfb32a2
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sun Aug 24 17:32:28 2014 +0200

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

 ChangeLog                                          |   58 +
 NEWS                                               |    9 +
 aclocal.m4                                         | 3475 ++++++++++----------
 configure                                          |   25 +-
 configure.ac                                       |    2 +-
 data/empathy.desktop                               |    2 +-
 data/empathy.desktop.in                            |    2 +-
 libempathy-gtk/empathy-account-chooser.c           |    4 +
 libempathy-gtk/empathy-presence-chooser.c          |    3 +
 po/de.po                                           |    4 +-
 telepathy-account-widgets/po/el.po                 |  223 +-
 .../tp-account-widgets/tpaw-account-widget.c       |   90 +-
 .../tp-account-widgets/tpaw-account-widget.h       |    2 +-
 13 files changed, 1991 insertions(+), 1908 deletions(-)

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