[Pkg-telepathy-commits] [telepathy-glib] 11/12: Merge tag 'upstream/0.22.1' 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 telepathy-glib.

commit 5684cb4ec1a7e9040bbbc0e475ac66ec1f76ceb9
Merge: 9627085 834d8c5
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jan 29 12:26:41 2014 +0000

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

 ChangeLog                                       | 63 +++++++++++++++++++++++++
 Makefile.in                                     |  5 +-
 NEWS                                            | 17 +++++++
 aclocal.m4                                      |  6 +--
 configure                                       | 22 ++++-----
 configure.ac                                    |  2 +-
 docs/Makefile.in                                |  2 +-
 docs/reference/Makefile.in                      |  2 +-
 docs/reference/html/annotation-glossary.html    | 50 ++++++++++----------
 docs/reference/html/index.html                  |  2 +-
 docs/reference/html/index.sgml                  | 14 +++---
 docs/reference/html/telepathy-glib-util.html    |  2 +-
 docs/reference/html/telepathy-glib-version.html |  4 +-
 docs/reference/version.xml                      |  2 +-
 examples/Makefile.in                            |  2 +-
 examples/client/Makefile.in                     |  2 +-
 examples/client/dbus-tubes/Makefile.in          |  2 +-
 examples/client/js/Makefile.in                  |  2 +-
 examples/client/js/contact-list.js              |  3 ++
 examples/client/js/debug-client.js              |  3 ++
 examples/client/python/Makefile.in              |  2 +-
 examples/client/python/contact-list.py          |  2 +
 examples/client/python/dialler.py               |  2 +
 examples/client/python/ensure-channel.py        |  3 ++
 examples/client/python/file-transfer.py         |  3 ++
 examples/client/python/ft-handler.py            |  3 ++
 examples/client/python/inspect-cm.py            |  2 +
 examples/client/python/stream-tube-accepter.py  |  2 +
 examples/client/python/stream-tube-offerer.py   |  2 +
 examples/client/python/text-handler.py          |  3 ++
 examples/client/stream-tubes/Makefile.in        |  2 +-
 examples/cm/Makefile.in                         |  2 +-
 examples/cm/call/Makefile.in                    |  2 +-
 examples/cm/channelspecific/Makefile.in         |  2 +-
 examples/cm/contactlist/Makefile.in             |  2 +-
 examples/cm/echo-message-parts/Makefile.in      |  2 +-
 examples/cm/extended/Makefile.in                |  2 +-
 examples/cm/no-protocols/Makefile.in            |  2 +-
 examples/extensions/Makefile.in                 |  2 +-
 m4/Makefile.in                                  |  2 +-
 spec/Makefile.in                                |  2 +-
 telepathy-glib/Makefile.in                      |  2 +-
 telepathy-glib/base-client.c                    |  3 ++
 telepathy-glib/channel-group.c                  |  2 +-
 telepathy-glib/run.c                            |  3 +-
 tests/Makefile.in                               |  2 +-
 tests/dbus/Makefile.in                          |  2 +-
 tests/lib/Makefile.in                           |  2 +-
 tests/tools/Makefile.in                         |  2 +-
 tools/Makefile.in                               |  2 +-
 vala/Makefile.in                                |  2 +-
 51 files changed, 194 insertions(+), 81 deletions(-)

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