[glib-networking] 2.31.6

[Dan Winship <danw src gnome org>]

commit 22bb5bcc8dc025cebe631ede566f096a38245f9e
Author: Dan Winship <danw gnome org>
Date:   Mon Dec 19 20:25:33 2011 -0500

    2.31.6

 NEWS         |   18 ++++++++++++++++++
 configure.ac |    4 ++--
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index f6ec9c8..b20b636 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+2.31.6
+======
+  * gnutls
+	* Support gnutls built against nettle instead of gcrypt
+          (#657306)
+
+	* Implement TLS session caching for GTlsServerConnection
+          (#636574)
+
+  * tls/tests: Explicitly request the memory GSettings backend, to
+    avoid warnings in partial jhbuild environments
+
+  * proxy/gnome: Update to use GInetAddressMask
+
+  * Updated translations:
+	Chinese (simplified), Hebrew, Norwegian bokmÃl, Slovenian,
+	Swedish, Ukranian
+
 2.31.2
 ======
   * gnutls
diff --git a/configure.ac b/configure.ac
index 0964b60..c19edd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.65)
 AC_CONFIG_MACRO_DIR([m4])
 
-AC_INIT([glib-networking],[2.31.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network])
+AC_INIT([glib-networking],[2.31.6],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network])
 
 AC_CONFIG_SRCDIR([proxy/libproxy/glibproxyresolver.h])
 AC_CONFIG_HEADERS([config.h])
@@ -33,7 +33,7 @@ AM_GLIB_GNU_GETTEXT
 dnl *****************************
 dnl *** Check GLib GIO        ***
 dnl *****************************
-AM_PATH_GLIB_2_0(2.31.2,,AC_MSG_ERROR(GLIB not found),gio)
+AM_PATH_GLIB_2_0(2.31.6,,AC_MSG_ERROR(GLIB not found),gio)
 
 GIO_MODULE_DIR=$($PKG_CONFIG --variable giomoduledir gio-2.0)
 AS_IF([test "x$GIO_MODULE_DIR" = "x"],