From 67df58aca6166498bfa5c04e024865cfd6d79c99 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Tue, 22 Jul 2014 13:59:53 +0200
Subject: [PATCH] dconf 0.21.0

---
 NEWS         | 16 +++++++++++++++-
 configure.ac |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index a1d18ee..bc60532 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,18 @@
-Changes ind conf 0.20.0
+Changes in dconf 0.21.0
+========================
+
+ - editor desktop file renamed to ca.desrt.dconf-editor to take advantage of
+   D-Bus activation
+
+ - prevent the service from being released more than once if we receive
+   multiple signals (which caused a hang)
+
+Translations:
+  Indonesian
+  Greek
+  Swedish
+
+Changes in dconf 0.20.0
 ========================
 
 Czech translation updated.
diff --git a/configure.ac b/configure.ac
index d7f3cea..2f765af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([dconf],
-        [0.20.0],
+        [0.21.0],
         [https://bugzilla.gnome.org/enter_bug.cgi?product=dconf],
         [dconf])
 
-- 
2.11.4.GIT