Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 9 May 2012 10:58:36 +0000 (12:58 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 9 May 2012 10:58:36 +0000 (12:58 +0200)
commit1158dc8bbcb0bd5d161333380fe91e93185674a6
treec5a2d6a46b66e4e40bcbf27c8c5b8bd4efaa3102
parent4c528bfa11ac8640b5bf8f7018d0d096d30081df
parent9401913fbcdbead99f1180848f5fef0d02fd871e
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy

Conflicts:
src/metaproxy_prog.cpp