From: Jakub Skoczen <jakub@indexdata.dk>
Date: Mon, 12 Apr 2010 09:54:49 +0000 (+0200)
Subject: Merge commit 'origin/json-client'
X-Git-Tag: v1.4.0~42^2
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=61b0286e7f7c7c496dd61cfc0dc6c997f43f23f4;p=pazpar2-moved-to-github.git

Merge commit 'origin/json-client'
---

61b0286e7f7c7c496dd61cfc0dc6c997f43f23f4