Merge branch 'master' into sru_2_0

Conflicts:
	debian/changelog
	debian/rules

diff --git a/NEWS b/NEWS
index d6e820b..f67c855 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+--- 4.2.67 2013/09/19 
+
+Don't decode MAB as MARC. Just like we don't attempt to decode
+HTML/XML as MARC. Fixes MAB display problem that was introduced in 4.2.64.
+
+CCL: allow quoted terms for date ranges. YAZ-681
+
+Introduce ccl_parser_qual_search. This function makes old function
+ccl_qual_search, from YAZ 2, available again.
+
+Add yaz_facet_list_to_wrbuf. YAZ-683
+
 --- 4.2.66 2013/09/11
 
 ZOOM: fix record handling for Solr. ZOOM_record_get would return 0, if

diff --git a/debian/changelog b/debian/changelog
index c1701b0..5f2412f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ yaz (5.0.0-1indexdata) unstable; urgency=low
 
  -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 11 Sep 2013 09:26:11 +0200
 
+yaz (4.2.67-1indexdata) unstable; urgency=low
+
+  * Upstram.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 19 Sep 2013 13:19:07 +0200
+
 yaz (4.2.66-1indexdata) unstable; urgency=low
 
   * Upstream.