From: Adam Dickmeiss <adam@indexdata.dk>
Date: Sun, 22 Sep 2013 16:18:28 +0000 (+0200)
Subject: Merge branch 'master' into sru_2_0
X-Git-Tag: v5.0.0~28
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=f50e88ece40cd62eb9e969cd138e3f274725a991;hp=f50e88ece40cd62eb9e969cd138e3f274725a991

Merge branch 'master' into sru_2_0

Conflicts:
	src/rpn2solr.c
---