From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 9 Jul 2010 15:18:03 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
X-Git-Tag: v4.0.12~69
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=78823e16ccc4715b60ba1ff4144b8e4d4611ae75;hp=120720e0d9c4fb0bcb2dae04d925ce03c64ede68

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
---

diff --git a/NEWS b/NEWS
index 9899cc9..7f50c11 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+--- 4.0.11 2010/07/09
+
+CCL fixes: bug 2895 and bug 3539.
+
+GR1-display: add comma in display - was removed by mistake in
+version 4.0.0.
+
+Windows installer: bundle MSVCP90.dll - used by icuuc42.dll.
+
+SRU: Merge cookies on HTTP redirects (Giannis Kosmas <kosmas@lib.uoc.gr>).
+
 --- 4.0.10 2010/06/18
 
 ZOOM C: Add ZOOM_resultset_release. ZOOM_resultset_release releases a
diff --git a/configure.ac b/configure.ac
index 9bc7113..6e50432 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl This file is part of the YAZ toolkit.
 dnl Copyright (C) 1995-2010 Index Data
 AC_PREREQ([2.60])
-AC_INIT([yaz],[4.0.10],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[4.0.11],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.9])
diff --git a/debian/changelog b/debian/changelog
index 43c09d5..27b4bf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yaz (4.0.11-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 09 Jul 2010 16:41:41 +0200
+
 yaz (4.0.10-1indexdata) unstable; urgency=low
 
   * Upstream.