[Pkg-telepathy-commits] [empathy] 02/03: Merge tag 'upstream/3.12.2' 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 4805c3d6db240b50fa9863d3fafcc54bd3cb093a
Merge: c10fb91 313f7d9
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Fri May 16 20:33:26 2014 +0200

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

 ChangeLog                          |  110 +
 NEWS                               |   16 +
 aclocal.m4                         | 3475 +++++++++---------
 configure                          |   25 +-
 configure.ac                       |    2 +-
 data/empathy.desktop               |    3 +-
 data/empathy.desktop.in            |    2 +-
 help/es/account-jabber.page        |    2 +-
 help/es/es.po                      | 1786 ++++++----
 libempathy-gtk/empathy-chat.c      |   37 +-
 po/be.po                           |  590 ++--
 po/ca at valencia.po                  |  644 ++--
 po/es.po                           |   14 +-
 po/id.po                           |  483 ++-
 po/ro.po                           | 6826 ++++++++++++++++++------------------
 telepathy-account-widgets/po/es.po |   94 +-
 telepathy-account-widgets/po/id.po |  102 +-
 17 files changed, 7298 insertions(+), 6913 deletions(-)

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