[Pkg-telepathy-commits] [telepathy-glib] 25/111: Merge branch 'telepathy-glib-0.22'

[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 7b6e496317a332b81fb079256f7995cf082b5c57
Merge: e7b9ae3 96cfbd0
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Oct 2 16:44:31 2013 +0100

    Merge branch 'telepathy-glib-0.22'
    
    Conflicts:
    	NEWS
    	configure.ac

 NEWS         | 29 ++++++++++++++++++++++++++++-
 configure.ac |  2 +-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --cc NEWS
index b93d715,07663fa..fc97aa6
--- a/NEWS
+++ b/NEWS
@@@ -1,7 -1,21 +1,21 @@@
 -telepathy-glib 0.22.1 (UNRELEASED)
 +telepathy-glib 0.23.0 (UNRELEASED)
  ==================================
  
- Fixes:
+ …
+ 
+ telepathy-glib 0.22.0 (2013-10-02)
+ ==================================
+ 
+ The “don't starve” release.
+ 
+ This is a new stable branch, recommended for use with GNOME 3.10.
+ 
+ Fixes since 0.21.2:
+ 
+ • When an avatar is downloaded, announce the change to the avatar token
+   immediately; if the avatar changes from A to B while we're still doing the
+   asynchronous file saving, don't set A as the new avatar when it has been
+   saved. Regression in 0.21.2. (fd.o #70010, Simon)
  
  • Don't crash if the AccountManager returns an incorrect type for the
    Avatar (fd.o #69849, Simon)

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