From 37889e5f7ca5e2e45442f98dc84efb70d2acf907 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@gnome.org>
Date: Thu, 6 Sep 2012 11:34:07 +0200
Subject: Release version 0.14

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

diff --git a/NEWS b/NEWS
index dcd1ed7..d2eb42c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+0.14
+ * Change default for user-config to merge
+ * Always URI-encode the 'id' attribute in PKCS#11 URIs
+ * Expect a .module extension on module configs
+ * Windows compatibility fixes
+ * Testing fixes
+ * Build fixes
+
 0.13
  * Don't allow reading of PIN files larger than 4096 bytes
  * If a module is not marked as critical then ignore init failure
diff --git a/configure.ac b/configure.ac
index 5b65a93..b0bf648 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.61)
 
 AC_INIT([p11-kit],
-	[0.13],
+	[0.14],
 	[https://bugs.freedesktop.org/enter_bug.cgi?product=p11-glue],
 	[p11-kit],
 	[http://p11-glue.freedesktop.org/p11-kit.html])
-- 
cgit v1.2.1