[Pkg-telepathy-commits] [empathy] 33/39: Merge tag 'upstream/3.8.6' into debian

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository empathy.

commit 7b6b3d6a7f754a1f84afe7643f924a2e5db4afa6
Merge: a29dd76 5bfe0bf
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jan 29 09:08:57 2014 +0000

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

 ChangeLog                                 |  869 +++--
 NEWS                                      |   20 +
 aclocal.m4                                | 2828 +++++++--------
 configure                                 |   32 +-
 configure.ac                              |    2 +-
 data/empathy.desktop                      |    4 +-
 data/empathy.desktop.in                   |    2 +-
 libempathy-gtk/egg-list-box/configure     |   12 +-
 libempathy-gtk/egg-list-box/m4/libtool.m4 |   12 +-
 libempathy/empathy-sasl-mechanisms.c      |   33 +-
 m4/libtool.m4                             |   12 +-
 po/fi.po                                  | 1485 ++++----
 po/tr.po                                  | 5449 +++++++++++++++--------------
 src/empathy-audio-sink.c                  |    1 +
 src/empathy-debug-window.c                |    2 +-
 src/empathy-roster-window.c               |  122 +-
 16 files changed, 5699 insertions(+), 5186 deletions(-)

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