From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 21 Oct 2014 08:24:09 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
X-Git-Tag: v1.7.0~5
X-Git-Url: http://git.indexdata.com/?p=metaproxy-moved-to-github.git;a=commitdiff_plain;h=4af83af2939aae2ddf5d9fb018663c1cf0f424a1

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

Conflicts:
	NEWS
---

4af83af2939aae2ddf5d9fb018663c1cf0f424a1