[Pkg-telepathy-commits] [telepathy-glib] 12/13: Merge tag 'upstream/0.22.0' 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 59d22f8dbc0b0f7e84f0df2a741634e82f601765
Merge: ddc0538 4fa6fa1
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Oct 2 14:44:14 2013 +0100

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

 ChangeLog                                          |   90 +++++++++
 Makefile.am                                        |    2 +-
 Makefile.in                                        |    2 +-
 NEWS                                               |   30 +++
 configure                                          |   29 +--
 configure.ac                                       |    9 +-
 docs/reference/Makefile.am                         |   12 +-
 docs/reference/Makefile.in                         |   12 +-
 docs/reference/html/annotation-glossary.html       |   49 +++--
 docs/reference/html/index.html                     |    4 +-
 docs/reference/html/index.sgml                     |   13 +-
 .../html/telepathy-glib-account-manager.html       |  208 +-------------------
 docs/reference/html/telepathy-glib-version.html    |    2 +-
 docs/reference/telepathy-glib-docs.sgml            |    2 +
 docs/reference/version.xml                         |    2 +-
 telepathy-glib/account.c                           |    6 +
 telepathy-glib/contact.c                           |   36 +++-
 17 files changed, 222 insertions(+), 286 deletions(-)

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