From 8f3c5793bba8c152549535b5d2716766aeb1b91f Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 25 Sep 2012 10:47:48 +0200
Subject: [PATCH] 3.6.0

---
 NEWS         | 17 +++++++++++++++++
 configure.ac |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index f4bd7d3ea..293d103a4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+===========================
+Version 3.6.0 (2012-25-09)
+===========================
+
+Shell:
+- Fix broken panels when launching the same one twice
+
+Network:
+- Make connecting to Enterprise WPA Wi-Fi networks work again
+
+User Accounts:
+- Don't ask for the old password when none is set
+
+Region:
+- Jump directly to the correct shortcuts section when
+  following the link
+
 ===========================
 Version 3.5.92 (2012-17-09)
 ===========================
diff --git a/configure.ac b/configure.ac
index 46448c4b2..5b05b71cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-m4_define([gnome_control_center_version], 3.5.92)
+m4_define([gnome_control_center_version], 3.6.0)
 AC_INIT([gnome-control-center], [gnome_control_center_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center])