summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-01-29 12:58:38 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-01-29 12:58:38 +0000
commit64e9a2cfc53c6786e0a1005f244fa7a8e635d8c7 (patch)
tree8c5b81fa18541855ae88115ab46a029df26d430f
parent640e19a07a39756a8c3b5b68595589679403cc43 (diff)
parentbba70fce033c7b5fcc120fcfce715ec79ca1361a (diff)
downloadtelepathy-glib-64e9a2cfc53c6786e0a1005f244fa7a8e635d8c7.tar.gz
Merge branch 'telepathy-glib-0.22'
Conflicts: NEWS configure.ac
-rw-r--r--NEWS1
1 files changed, 0 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index f647b2e73..4e5262074 100644
--- a/NEWS
+++ b/NEWS
@@ -70,7 +70,6 @@ Fixes:
• channel-group: don't crash if no message has been provided (Guillaume)
-
telepathy-glib 0.22.0 (2013-10-02)
==================================