[Pkg-telepathy-commits] [empathy] 02/02: Merge tag 'upstream/3.12.7' 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 b5b172207fc042fca0c6208897fbe61dd4cfcf64
Merge: 7f3c8b1 bfa535c
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Oct 14 22:11:00 2014 +0200

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

 ChangeLog                              |  150 +
 Makefile.in                            |    2 +-
 NEWS                                   |   19 +
 aclocal.m4                             | 3502 ++++++++++----------
 config.guess                           |  313 +-
 config.sub                             |   56 +-
 configure                              |   20 +-
 configure.ac                           |    2 +-
 data/empathy.desktop                   |   13 +-
 data/empathy.desktop.in                |    2 +-
 help/C/add-account.page                |   28 +-
 help/C/audio-video.page                |   64 +-
 help/ca/add-account.page               |   17 +-
 help/ca/audio-video.page               |   38 +-
 help/cs/add-account.page               |   17 +-
 help/cs/audio-video.page               |   38 +-
 help/de/add-account.page               |   17 +-
 help/de/audio-video.page               |   38 +-
 help/el/add-account.page               |   17 +-
 help/el/audio-video.page               |   38 +-
 help/en_GB/add-account.page            |   28 +-
 help/en_GB/audio-video.page            |   62 +-
 help/es/add-account.page               |   17 +-
 help/es/audio-video.page               |   38 +-
 help/eu/add-account.page               |   18 +-
 help/eu/audio-video.page               |   46 +-
 help/fi/add-account.page               |   28 +-
 help/fi/audio-video.page               |   62 +-
 help/fr/add-account.page               |   17 +-
 help/fr/audio-video.page               |   38 +-
 help/gl/account-irc.page               |    8 +-
 help/gl/add-account.page               |   17 +-
 help/gl/audio-call.page                |   19 +-
 help/gl/audio-video.page               |   38 +-
 help/gl/create-account.page            |   53 +-
 help/gl/gl.po                          | 2825 ++++++++++------
 help/gl/index.page                     |    7 +-
 help/gl/irc-manage.page                |    3 +-
 help/gl/link-contacts.page             |   66 +-
 help/gl/overview.page                  |   32 +-
 help/gl/prob-conn-auth.page            |    3 +-
 help/gl/prob-conn-name.page            |    3 +-
 help/gl/prob-conn-neterror.page        |    3 +-
 help/gl/status-icons.page              |   17 +-
 help/gl/video-call.page                |    9 +-
 help/hu/add-account.page               |   12 +-
 help/hu/audio-video.page               |   37 +-
 help/hu/hu.po                          | 2260 +++++++------
 help/it/add-account.page               |   18 +-
 help/it/audio-video.page               |   46 +-
 help/ja/add-account.page               |   17 +-
 help/ja/audio-video.page               |   38 +-
 help/lv/add-account.page               |   17 +-
 help/lv/audio-video.page               |   38 +-
 help/pl/add-account.page               |   18 +-
 help/pl/audio-video.page               |   46 +-
 help/pt_BR/add-account.page            |   28 +-
 help/pt_BR/audio-video.page            |   62 +-
 help/ru/add-account.page               |   28 +-
 help/ru/audio-video.page               |   62 +-
 help/sl/add-account.page               |   17 +-
 help/sl/audio-video.page               |   38 +-
 help/sv/add-account.page               |   28 +-
 help/sv/audio-video.page               |   62 +-
 help/te/add-account.page               |   28 +-
 help/te/audio-video.page               |   60 +-
 help/zh_CN/add-account.page            |   18 +-
 help/zh_CN/audio-video.page            |   46 +-
 po/bg.po                               | 2438 +++++---------
 po/bn_IN.po                            | 5403 ++++++++++++++++++++-----------
 po/el.po                               |  631 ++--
 po/fa.po                               |  681 ++--
 po/hi.po                               | 2980 ++++++++---------
 po/sv.po                               | 5569 +++++++++++++++++---------------
 po/ta.po                               |  536 ++-
 po/te.po                               |  719 +++--
 telepathy-account-widgets/config.guess |  313 +-
 telepathy-account-widgets/config.sub   |   56 +-
 78 files changed, 15459 insertions(+), 14739 deletions(-)

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