[Pkg-telepathy-commits] [empathy] 02/04: Merge tag 'upstream/3.12.6' 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 4080b7f148a81c883bebcb256e0282cc59427a13
Merge: 3f6c214 8e1dad9
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sat Sep 13 15:11:48 2014 +0200

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

 ChangeLog                                          |  155 +
 NEWS                                               |   17 +
 configure                                          |   20 +-
 configure.ac                                       |    2 +-
 data/empathy.css                                   |    5 +
 data/empathy.desktop                               |    6 +-
 data/empathy.desktop.in                            |    2 +-
 .../empathy-individual-information-dialog.c        |    7 +-
 libempathy-gtk/empathy-smiley-manager.c            |    7 +-
 po/fi.po                                           |  222 +-
 po/gu.po                                           | 2967 +++++++++---------
 po/kn.po                                           | 3181 +++++++++-----------
 po/ko.po                                           |   19 +-
 po/mr.po                                           | 2986 +++++++++---------
 po/or.po                                           | 3000 +++++++++---------
 po/sk.po                                           | 1026 +++----
 src/empathy-roster-window.c                        |    5 +-
 telepathy-account-widgets/aclocal.m4               |  427 +--
 telepathy-account-widgets/configure                |    5 +-
 telepathy-account-widgets/po/el.po                 |  223 +-
 .../tp-account-widgets/tpaw-account-widget.c       |   90 +-
 .../tp-account-widgets/tpaw-account-widget.h       |    2 +-
 22 files changed, 6760 insertions(+), 7614 deletions(-)

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