Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 20 Sep 2013 07:20:23 +0000 (09:20 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 20 Sep 2013 07:20:23 +0000 (09:20 +0200)
Conflicts:
IDMETA
debian/changelog
debian/rules

1  2 
client/client.c
debian/changelog
src/seshigh.c

diff --cc client/client.c
Simple merge
@@@ -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