From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 9 May 2012 10:58:36 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
X-Git-Tag: v1.3.35~4
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=1158dc8bbcb0bd5d161333380fe91e93185674a6;p=metaproxy-moved-to-github.git

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

Conflicts:
	src/metaproxy_prog.cpp
---

1158dc8bbcb0bd5d161333380fe91e93185674a6