From: Mike Taylor <mike@indexdata.com>
Date: Fri, 26 Aug 2011 14:09:33 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
X-Git-Tag: v1.3.14~6
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=eec533f49ad28f58c3f6153281e6ef13be3708d3;p=metaproxy-moved-to-github.git

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

eec533f49ad28f58c3f6153281e6ef13be3708d3