From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 19 Sep 2013 11:11:47 +0000 (+0200)
Subject: Merge branch 'master' into sru_2_0
X-Git-Tag: v5.0.0~32^2~4
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=a00add15f1d9f9a33d8f6fe2e5f3cb04171d8aa1

Merge branch 'master' into sru_2_0

Conflicts:
	IDMETA
---

a00add15f1d9f9a33d8f6fe2e5f3cb04171d8aa1