From: Dennis Schafroth <dennis@indexdata.com>
Date: Mon, 16 Aug 2010 09:01:09 +0000 (+0200)
Subject: Merge branch 'solr_client' of ssh://git.indexdata.com/home/git/pub/yaz into solr_client
X-Git-Tag: v4.1.0~40^2~1^2
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=8c7858ee7a1266db5ac2e18393ef331cadb687b0;p=yaz-moved-to-github.git

Merge branch 'solr_client' of ssh://git.indexdata.com/home/git/pub/yaz into solr_client

Conflicts:
	test/Makefile.am
---

8c7858ee7a1266db5ac2e18393ef331cadb687b0