From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 29 Apr 2011 11:27:38 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
X-Git-Tag: v1.2.5~1
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=395e445b414be1e327c38b33b639a4052fef2318;p=metaproxy-moved-to-github.git

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

Conflicts:
	IDMETA
---

395e445b414be1e327c38b33b639a4052fef2318