telepathy-glib: prepare 0.20.4

[Simon McVittie]

Module: telepathy-glib
Branch: master
Commit: ff51b6a6a9f2ba28d3d919e60ef98c13ce0a77a0
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=ff51b6a6a9f2ba28d3d919e60ef98c13ce0a77a0

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Jul 24 13:21:57 2013 +0100

prepare 0.20.4

---

 NEWS         |   11 +++++++++--
 configure.ac |    6 +++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 864fed6..1d1bdc5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,14 @@
-telepathy-glib 0.20.4 (UNRELEASED)
+telepathy-glib 0.20.4 (2013-07-24)
 ==================================
 
-...
+The “air-conditioned” release.
+
+Fixes:
+
+• Don't crash if GetContactInfo() fails (fd.o #46430, Guillaume)
+
+• Fix a race condition that could result in telepathy-haze protocol support
+  not being detected (fd.o #67183, Simon)
 
 telepathy-glib 0.20.3 (2013-06-20)
 ==================================
diff --git a/configure.ac b/configure.ac
index 9879ae7..93b44eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,8 @@ AC_PREREQ([2.59])
 
 m4_define([tp_glib_major_version], [0])
 m4_define([tp_glib_minor_version], [20])
-m4_define([tp_glib_micro_version], [3])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_micro_version], [4])
+m4_define([tp_glib_nano_version], [0])
 
 # If library source has changed since last release, increment revision
 # If interfaces have been added, removed or changed since last release,
@@ -27,7 +27,7 @@ m4_define([tp_glib_nano_version], [1])
 # never seen in a release).
 
 m4_define([tp_glib_lt_current], [78])
-m4_define([tp_glib_lt_revision], [3])
+m4_define([tp_glib_lt_revision], [4])
 m4_define([tp_glib_lt_age], [78])
 
 # Some magic