Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorMike Taylor <mike@indexdata.com>
Fri, 26 Aug 2011 14:09:33 +0000 (15:09 +0100)
committerMike Taylor <mike@indexdata.com>
Fri, 26 Aug 2011 14:09:33 +0000 (15:09 +0100)
commiteec533f49ad28f58c3f6153281e6ef13be3708d3
treed6f721104589e7d3b8fa608dc530200dde6bfec9
parentb7edcef0801225d466b1284a00a03b9ca6e7658e
parenta6be17b47acb7c23ffb8d920a9722c925e92d426
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy