From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 11 Sep 2013 11:15:43 +0000 (+0200)
Subject: Merge branch 'master' into sru_2_0
X-Git-Tag: v5.0.0~42
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=1f5e4f24c6e51d741e15317348bc7aef05fcc7ab;hp=1f5e4f24c6e51d741e15317348bc7aef05fcc7ab;p=yaz-moved-to-github.git

Merge branch 'master' into sru_2_0

Conflicts:
	src/rpn2solr.c
---