From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 23 Sep 2013 13:41:46 +0000 (+0200)
Subject: Merge branch 'master' into sru_2_0
X-Git-Tag: v5.0.0~26
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=2fc1ed65e59499ef747922ea9763d8f21f056f6e;hp=2fc1ed65e59499ef747922ea9763d8f21f056f6e

Merge branch 'master' into sru_2_0

Conflicts:
	IDMETA
	debian/changelog
	debian/rules
---