From: Adam Dickmeiss Date: Fri, 6 May 2011 12:53:12 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy X-Git-Tag: v1.2.6~39 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=740f3cd48580328d327e1a20fcb9f334da33683a;p=metaproxy-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy --- 740f3cd48580328d327e1a20fcb9f334da33683a