Merge branch 'master' into sru_2_0

Conflicts:
	IDMETA
	debian/changelog
	debian/rules

diff --cc client/client.c
Simple merge

diff --cc debian/changelog
index c1701b0,f068c81..5f2412f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 +yaz (5.0.0-1indexdata) unstable; urgency=low
 +
 +  * Version 5.
 +
 + -- 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.

diff --cc src/seshigh.c
Simple merge