From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 9 Mar 2009 08:05:03 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
X-Git-Tag: v1.0.16~19
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=6e9168faac84bf914a9ecb87e6ba2efca1c410da;p=metaproxy-moved-to-github.git

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

Conflicts:

	m4
---

6e9168faac84bf914a9ecb87e6ba2efca1c410da