[gnome-settings-daemon/gnome-3-12] 3.12.1

[Rui Matos <rtcm src gnome org>]

commit e0a1d97339a0ba92d5eb419d8d199c67dcc1d822
Author: Rui Matos <tiagomatos gmail com>
Date:   Wed Apr 16 13:56:22 2014 +0200

    3.12.1

 NEWS         |   14 ++++++++++++++
 configure.ac |    2 +-
 2 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index 4fa8e1c..02c9174 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+==============
+Version 3.12.1
+==============
+
+Date & Time:
+- Make the geolocation marker in gnome-shell's status area go away
+  after turning Automatic Time Zone off
+
+Keyboard:
+- Fix consecutive xkb grp: options not being stripped
+
+Updates:
+- Let gnome-software handle update checking
+
 ================
 Version 3.12.0.1
 ================
diff --git a/configure.ac b/configure.ac
index 16a4067..d5b51f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.60])
 
 AC_INIT([gnome-settings-daemon],
-        [3.12.0.1],
+        [3.12.1],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-settings-daemon])
 
 AC_CONFIG_SRCDIR([gnome-settings-daemon/gnome-settings-manager.c])