[Pkg-telepathy-commits] [empathy] 03/06: Merge tag 'upstream/3.12.10' 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 a4b600ba9d5095fc225ecc0dae9fc17cd4458271
Merge: 3b784b8 a470897
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sun May 24 13:08:48 2015 +0200

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

 ChangeLog                                          | 147 ++++
 NEWS                                               |  16 +
 configure                                          |  20 +-
 configure.ac                                       |   2 +-
 data/empathy.desktop                               |   4 +-
 data/empathy.desktop.in                            |   2 +-
 data/icons/Makefile.am                             |   1 +
 data/icons/Makefile.in                             |   1 +
 .../hicolor_apps_scalable_empathy-symbolic.svg     |  23 +
 help/es/es.po                                      | 185 ++---
 help/es/index.page                                 |   2 +-
 help/es/introduction.page                          |   6 +-
 help/es/link-contacts.page                         |   4 +-
 libempathy-gtk/empathy-avatar-image.c              |  33 +
 .../empathy-local-xmpp-assistant-widget.c          |   1 +
 po/ja.po                                           | 905 +++++++++++----------
 src/empathy-preferences.ui                         |   4 +
 telepathy-account-widgets/po/LINGUAS               |   1 +
 telepathy-account-widgets/po/an.po                 | 342 +++++---
 telepathy-account-widgets/po/{fi.po => bs.po}      | 559 ++++++-------
 telepathy-account-widgets/po/el.po                 | 223 +++--
 telepathy-account-widgets/po/fi.po                 | 102 +--
 telepathy-account-widgets/po/kk.po                 | 475 ++++++-----
 telepathy-account-widgets/po/sv.po                 | 355 ++++----
 telepathy-account-widgets/po/tr.po                 | 375 +++++----
 .../tp-account-widgets/tpaw-account-widget.c       |  90 +-
 .../tp-account-widgets/tpaw-account-widget.h       |   2 +-
 27 files changed, 2179 insertions(+), 1701 deletions(-)

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