From: Mike Taylor <mike@indexdata.com>
Date: Tue, 23 Aug 2011 12:08:21 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
X-Git-Tag: v1.3.14~8
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=c2feaf41b556d12128ce7f496a452fef03b6cd4c;hp=--cc;p=metaproxy-moved-to-github.git

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

c2feaf41b556d12128ce7f496a452fef03b6cd4c