From 5534b98d73f1a15edcc61551115a0d7a17751e30 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 18 Nov 2016 18:55:07 +0100
Subject: version bump and ChangeLog update

---
 ChangeLog    | 4 ++++
 configure.ac | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 07d520ec..605dfc8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Nov 18 18:54:07 CET 2016
+	Misc. minor updates to match API changes from exchange 0.2.
+	Releasing taler-merchant 0.2.0. -CG
+
 Mon Oct 10 16:27:57 CEST 2016
         Implementing:
         - /track API, to map transactions to wire transfers and
diff --git a/configure.ac b/configure.ac
index ca8d7f2a..138c8a8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # This configure file is in the public domain
 
 AC_PREREQ([2.69])
-AC_INIT([taler-merchant], [0.1.0], [taler-bug@gnunet.org])
+AC_INIT([taler-merchant], [0.2.0], [taler-bug@gnunet.org])
 AC_CONFIG_SRCDIR([src/backend/taler-merchant-httpd.c])
 AC_CONFIG_HEADERS([taler_merchant_config.h])
 # support for non-recursive builds
-- 
cgit v1.2.3