[Pkg-telepathy-commits] [telepathy-glib] 14/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 a02af787eab20a08a678a215c917b022c2ee6f8f
Merge: 31d338b 05c0077
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 26 16:32:42 2013 +0100

    Merge branch 'telepathy-glib-0.22'

 NEWS | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --cc NEWS
index f134e4b,803d2a3..b93d715
--- a/NEWS
+++ b/NEWS
@@@ -1,7 -1,10 +1,10 @@@
 -telepathy-glib 0.21.3 (UNRELEASED)
 +telepathy-glib 0.23.0 (UNRELEASED)
  ==================================
  
- ...
+ Fixes:
+ 
+ • Don't crash if the AccountManager returns an incorrect type for the
+   Avatar (fd.o #69849, Simon)
  
  telepathy-glib 0.21.2 (2013-09-24)
  ==================================

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