[glib-networking/glib-2-36] 2.36.2

[Dan Winship <danw src gnome org>]

commit c590b3ddf218176ed8e65eda74dc8d1b2afdbdde
Author: Dan Winship <danw gnome org>
Date:   Mon May 13 17:07:34 2013 -0400

    2.36.2

 NEWS         |   11 +++++++++++
 configure.ac |    2 +-
 2 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index efc6422..1502b36 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+2.36.2
+======
+  * proxy/gnome: Fix "automatic" mode, which was mistakenly being
+    treated as "none" (Dan)
+
+  * proxy/gnome: Use this in Unity sessions as well as GNOME ones.
+    (#698936, Iain Lane)
+
+  * proxy/libproxy: Fix handling of SOCKS proxies (#699359, Dan)
+
+
 2.36.1
 ======
   * gnutls: Fixed a bug that could cause hangs and/or bursts of CPU
diff --git a/configure.ac b/configure.ac
index 9b83696..0478d89 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.36.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network])
+AC_INIT([glib-networking],[2.36.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network])
 
 AC_CONFIG_SRCDIR([proxy/libproxy/glibproxyresolver.h])
 AC_CONFIG_HEADERS([config.h])