From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 16 Aug 2010 12:28:05 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.4.4~1
X-Git-Url: http://jsfdemo.indexdata.com/?a=commitdiff_plain;h=5410847495fb43bdc5c3e630fbc3f15a964640f9;hp=-c;p=pazpar2-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

Conflicts:
	src/client.c
---

5410847495fb43bdc5c3e630fbc3f15a964640f9